diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-06-25 05:20:00 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-06-25 05:41:09 +0200 |
| commit | ed6b8a100c1aabb342573f252509573bbe124d29 (patch) | |
| tree | 35874493d9470202b3221aa2a1666b6647494242 /sd/source | |
| parent | 78f6407978aa48c3cbb116bc281940dbf1f2dcbc (diff) | |
remove whitespaces
Change-Id: I9daea42a433b5032931a722878874917cf37f4d1
Diffstat (limited to 'sd/source')
601 files changed, 2 insertions, 11461 deletions
diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx index 731a196af4c8..b070733c6f30 100644 --- a/sd/source/core/CustomAnimationPreset.cxx +++ b/sd/source/core/CustomAnimationPreset.cxx @@ -601,7 +601,6 @@ Reference< XAnimationNode > CustomAnimationPresets::getRandomPreset( sal_Int16 n return xNode; } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx index d031618c5d19..c05e8a994667 100644 --- a/sd/source/core/EffectMigration.cxx +++ b/sd/source/core/EffectMigration.cxx @@ -532,8 +532,6 @@ void EffectMigration::SetAnimationEffect( SvxShape* pShape, AnimationEffect eEff } } - - AnimationEffect EffectMigration::GetAnimationEffect( SvxShape* pShape ) { OUString aPresetId; @@ -576,9 +574,6 @@ AnimationEffect EffectMigration::GetAnimationEffect( SvxShape* pShape ) return eEffect; } - - - void EffectMigration::SetTextAnimationEffect( SvxShape* pShape, AnimationEffect eEffect ) { DBG_ASSERT( pShape && pShape->GetSdrObject() && pShape->GetSdrObject()->GetPage(), @@ -718,8 +713,6 @@ void EffectMigration::SetTextAnimationEffect( SvxShape* pShape, AnimationEffect } } - - AnimationEffect EffectMigration::GetTextAnimationEffect( SvxShape* pShape ) { OUString aPresetId; @@ -751,8 +744,6 @@ AnimationEffect EffectMigration::GetTextAnimationEffect( SvxShape* pShape ) return eEffect; } - - bool EffectMigration::ConvertPreset( const OUString& rPresetId, const OUString* pPresetSubType, AnimationEffect& rEffect ) { rEffect = AnimationEffect_NONE; @@ -781,8 +772,6 @@ bool EffectMigration::ConvertPreset( const OUString& rPresetId, const OUString* } } - - bool EffectMigration::ConvertAnimationEffect( const AnimationEffect& rEffect, OUString& rPresetId, OUString& rPresetSubType ) { deprecated_AnimationEffect_conversion_table_entry* p = deprecated_AnimationEffect_conversion_table; @@ -800,8 +789,6 @@ bool EffectMigration::ConvertAnimationEffect( const AnimationEffect& rEffect, OU return false; } - - double EffectMigration::ConvertAnimationSpeed( AnimationSpeed eSpeed ) { double fDuration; @@ -815,7 +802,6 @@ double EffectMigration::ConvertAnimationSpeed( AnimationSpeed eSpeed ) return fDuration; } - void EffectMigration::SetAnimationSpeed( SvxShape* pShape, AnimationSpeed eSpeed ) { DBG_ASSERT( pShape && pShape->GetSdrObject() && pShape->GetSdrObject()->GetPage(), @@ -851,8 +837,6 @@ void EffectMigration::SetAnimationSpeed( SvxShape* pShape, AnimationSpeed eSpeed pMainSequence->rebuild(); } - - AnimationSpeed EffectMigration::GetAnimationSpeed( SvxShape* pShape ) { SdrObject* pObj = pShape->GetSdrObject(); @@ -880,8 +864,6 @@ AnimationSpeed EffectMigration::GetAnimationSpeed( SvxShape* pShape ) return ConvertDuration( fDuration ); } - - AnimationSpeed EffectMigration::ConvertDuration( double fDuration ) { AnimationSpeed eSpeed; @@ -896,8 +878,6 @@ AnimationSpeed EffectMigration::ConvertDuration( double fDuration ) return eSpeed; } - - void EffectMigration::SetDimColor( SvxShape* pShape, sal_Int32 nColor ) { DBG_ASSERT( pShape && pShape->GetSdrObject() && pShape->GetSdrObject()->GetPage(), @@ -932,8 +912,6 @@ void EffectMigration::SetDimColor( SvxShape* pShape, sal_Int32 nColor ) pMainSequence->rebuild(); } - - sal_Int32 EffectMigration::GetDimColor( SvxShape* pShape ) { sal_Int32 nColor = 0; @@ -964,9 +942,6 @@ sal_Int32 EffectMigration::GetDimColor( SvxShape* pShape ) return nColor; } - - - void EffectMigration::SetDimHide( SvxShape* pShape, bool bDimHide ) { DBG_ASSERT( pShape && pShape->GetSdrObject() && pShape->GetSdrObject()->GetPage(), @@ -1004,8 +979,6 @@ void EffectMigration::SetDimHide( SvxShape* pShape, bool bDimHide ) pMainSequence->rebuild(); } - - bool EffectMigration::GetDimHide( SvxShape* pShape ) { bool bRet = false; @@ -1036,8 +1009,6 @@ bool EffectMigration::GetDimHide( SvxShape* pShape ) return bRet; } - - void EffectMigration::SetDimPrevious( SvxShape* pShape, bool bDimPrevious ) { DBG_ASSERT( pShape && pShape->GetSdrObject() && pShape->GetSdrObject()->GetPage(), @@ -1078,8 +1049,6 @@ void EffectMigration::SetDimPrevious( SvxShape* pShape, bool bDimPrevious ) pMainSequence->rebuild(); } - - bool EffectMigration::GetDimPrevious( SvxShape* pShape ) { bool bRet = false; @@ -1110,8 +1079,6 @@ bool EffectMigration::GetDimPrevious( SvxShape* pShape ) return bRet; } - - void EffectMigration::SetPresentationOrder( SvxShape* pShape, sal_Int32 nNewPos ) { if( !pShape || !pShape->GetSdrObject() || !pShape->GetSdrObject()->GetPage() ) @@ -1201,8 +1168,6 @@ void EffectMigration::SetPresentationOrder( SvxShape* pShape, sal_Int32 nNewPos } } - - /** Returns the position of the given SdrObject in the Presentation order. * This function returns -1 if the SdrObject is not in the Presentation order * or if its the path-object. @@ -1242,8 +1207,6 @@ sal_Int32 EffectMigration::GetPresentationOrder( SvxShape* pShape ) return nFound; } - - void EffectMigration::UpdateSoundEffect( SvxShape* pShape, SdAnimationInfo* pInfo ) { if( pInfo ) @@ -1282,8 +1245,6 @@ void EffectMigration::UpdateSoundEffect( SvxShape* pShape, SdAnimationInfo* pInf } } - - OUString EffectMigration::GetSoundFile( SvxShape* pShape ) { OUString aSoundFile; @@ -1315,15 +1276,11 @@ OUString EffectMigration::GetSoundFile( SvxShape* pShape ) return aSoundFile; } - - bool EffectMigration::GetSoundOn( SvxShape* pShape ) { return !GetSoundFile( pShape ).isEmpty(); } - - void EffectMigration::SetAnimationPath( SvxShape* pShape, SdrPathObj* pPathObj ) { if( pShape && pPathObj ) diff --git a/sd/source/core/PageListWatcher.cxx b/sd/source/core/PageListWatcher.cxx index e6d3ad81ce57..590f8ed3993b 100644 --- a/sd/source/core/PageListWatcher.cxx +++ b/sd/source/core/PageListWatcher.cxx @@ -17,15 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "PageListWatcher.hxx" #include "sdpage.hxx" #include <tools/debug.hxx> #include <svx/svdmodel.hxx> - - void ImpPageListWatcher::ImpRecreateSortedPageListOnDemand() { // clear vectors @@ -166,7 +163,6 @@ sal_uInt32 ImpPageListWatcher::GetSdPageCount(PageKind ePgKind) return nRetval; } - sal_uInt32 ImpPageListWatcher::GetVisibleSdPageCount() { sal_uInt32 nVisiblePageCount = 0; @@ -182,8 +178,6 @@ sal_uInt32 ImpPageListWatcher::GetVisibleSdPageCount() return nVisiblePageCount; } - - sal_uInt32 ImpDrawPageListWatcher::ImpGetPageCount() const { return (sal_uInt32)mrModel.GetPageCount(); @@ -203,8 +197,6 @@ ImpDrawPageListWatcher::~ImpDrawPageListWatcher() { } - - sal_uInt32 ImpMasterPageListWatcher::ImpGetPageCount() const { return (sal_uInt32)mrModel.GetMasterPageCount(); diff --git a/sd/source/core/anminfo.cxx b/sd/source/core/anminfo.cxx index f0ae560c6f72..39fd126702dd 100644 --- a/sd/source/core/anminfo.cxx +++ b/sd/source/core/anminfo.cxx @@ -90,7 +90,6 @@ SdAnimationInfo::SdAnimationInfo(const SdAnimationInfo& rAnmInfo, SdrObject& rOb meEffect = presentation::AnimationEffect_NONE; } - SdAnimationInfo::~SdAnimationInfo() { } diff --git a/sd/source/core/annotations/AnnotationEnumeration.cxx b/sd/source/core/annotations/AnnotationEnumeration.cxx index c9afdbd9092c..838995e1c514 100644 --- a/sd/source/core/annotations/AnnotationEnumeration.cxx +++ b/sd/source/core/annotations/AnnotationEnumeration.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "sal/config.h" #include "boost/noncopyable.hpp" diff --git a/sd/source/core/cusshow.cxx b/sd/source/core/cusshow.cxx index 82c2b767bbca..dd0379d57bdf 100644 --- a/sd/source/core/cusshow.cxx +++ b/sd/source/core/cusshow.cxx @@ -85,7 +85,6 @@ uno::Reference< uno::XInterface > SdCustomShow::getUnoCustomShow() return xShow; } - void SdCustomShow::ReplacePage( const SdPage* pOldPage, const SdPage* pNewPage ) { if( !pNewPage ) @@ -108,5 +107,4 @@ void SdCustomShow::SetName(const OUString& rName) aName = rName; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index 3a08a8de83b3..c8d7bf22d764 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -366,7 +366,6 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) rLayerAdmin.SetControlLayerName(aControlLayerName); } - } // Destructor @@ -473,7 +472,6 @@ SdDrawDocument* SdDrawDocument::AllocSdDrawDocument() const pNewStylePool->CopyCellSheets(*pOldStylePool); pNewStylePool->CopyTableStyles(*pOldStylePool); - for (sal_uInt16 i = 0; i < GetMasterSdPageCount(PK_STANDARD); i++) { // Move with all of the master page's layouts @@ -930,14 +928,11 @@ void SdDrawDocument::SetPrinterIndependentLayout (sal_Int32 nMode) } } - - void SdDrawDocument::SetStartWithPresentation( bool bStartWithPresentation ) { mbStartWithPresentation = bStartWithPresentation; } - void SdDrawDocument::SetExitAfterPresenting( bool bExitAfterPresenting ) { mbExitAfterPresenting = bExitAfterPresenting; diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index a592640fba0d..7190291f9713 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -47,7 +47,6 @@ #include <svx/svditer.hxx> #include <svtools/imapobj.hxx> - #include "sdresid.hxx" #include "drawdoc.hxx" #include "sdpage.hxx" @@ -136,7 +135,6 @@ SdrObject* SdDrawDocument::GetObj(const OUString& rObjName) const return (pObjFound); } - // Find SdPage by name sal_uInt16 SdDrawDocument::GetPageByName(const OUString& rPgName, bool& rbIsMasterPage) const { @@ -628,7 +626,6 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ ) if( bClipboard ) pNotesMPage->SetLayoutName( pPage->GetLayoutName() ); - if( !pRefPage && (meDocType != DOCUMENT_TYPE_DRAW) ) pPage->SetAutoLayout( AUTOLAYOUT_TITLE, true, true ); @@ -802,7 +799,6 @@ bool SdDrawDocument::MovePages(sal_uInt16 nTargetPage) return bSomethingHappened; } - // Return number of links in sfx2::LinkManager sal_uLong SdDrawDocument::GetLinkCount() { @@ -839,7 +835,6 @@ void SdDrawDocument::SetLanguage( const LanguageType eLang, const sal_uInt16 nId } } - // Return language LanguageType SdDrawDocument::GetLanguage( const sal_uInt16 nId ) const { @@ -853,7 +848,6 @@ LanguageType SdDrawDocument::GetLanguage( const sal_uInt16 nId ) const return eLangType; } - // Initiate WorkStartup IMPL_LINK_NOARG(SdDrawDocument, WorkStartupHdl) { @@ -894,7 +888,6 @@ IMPL_LINK_NOARG(SdDrawDocument, WorkStartupHdl) return 0; } - // When the WorkStartupTimer has been created (this only happens in // SdDrawViewShell::Construct() ), the timer may be stopped and the WorkStartup // may be initiated. @@ -1278,9 +1271,6 @@ sal_uInt16 SdDrawDocument::CreatePage ( nInsertPosition); } - - - sal_uInt16 SdDrawDocument::DuplicatePage (sal_uInt16 nPageNum) { PageKind ePageKind = PK_STANDARD; @@ -1302,9 +1292,6 @@ sal_uInt16 SdDrawDocument::DuplicatePage (sal_uInt16 nPageNum) aVisibleLayers.IsSet(aBckgrndObj)); } - - - sal_uInt16 SdDrawDocument::DuplicatePage ( SdPage* pActualPage, PageKind ePageKind, @@ -1350,9 +1337,6 @@ sal_uInt16 SdDrawDocument::DuplicatePage ( nInsertPosition); } - - - sal_uInt16 SdDrawDocument::InsertPageSet ( SdPage* pActualPage, PageKind ePageKind, @@ -1418,9 +1402,6 @@ sal_uInt16 SdDrawDocument::InsertPageSet ( return pStandardPage->GetPageNum() / 2; } - - - void SdDrawDocument::SetupNewPage ( SdPage* pPreviousPage, SdPage* pPage, diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index f47a5d9ffd42..59c7832a7977 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -720,7 +720,6 @@ sal_uInt16 SdDrawDocument::GetMasterPageUserCount(SdrPage* pMaster) const return nResult; } - // Finish OnlineSpelling in the background void SdDrawDocument::StopOnlineSpelling() @@ -1069,8 +1068,6 @@ OUString SdDrawDocument::CreatePageNumValue(sal_uInt16 nNum) const return aPageNumValue; } - - // Rename layout template // Keep in mind that rOldLayoutName contains the _complete_ name of the layout // (including ~LT~). This is unlike rNewName. @@ -1292,7 +1289,6 @@ void SdDrawDocument::SetDefaultWritingMode(::com::sun::star::text::WritingMode e pItemPool->SetPoolDefaultItem( aAdjust ); - } } diff --git a/sd/source/core/pglink.cxx b/sd/source/core/pglink.cxx index c91b7cc742fb..6f32923daaa9 100644 --- a/sd/source/core/pglink.cxx +++ b/sd/source/core/pglink.cxx @@ -17,14 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <sfx2/linkmgr.hxx> #include "pglink.hxx" #include "sdpage.hxx" #include "drawdoc.hxx" - /************************************************************************* |* |* Ctor @@ -40,14 +38,12 @@ SdPageLink::SdPageLink(SdPage* pPg, const OUString& rFileName, pPage->SetBookmarkName(rBookmarkName); } - /************************************************************************* |* |* Dtor |* \************************************************************************/ - SdPageLink::~SdPageLink() { } @@ -132,6 +128,4 @@ void SdPageLink::Closed() SvBaseLink::Closed(); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/core/sdattr.cxx b/sd/source/core/sdattr.cxx index 01dbe043dcfd..1a0a7547d76b 100644 --- a/sd/source/core/sdattr.cxx +++ b/sd/source/core/sdattr.cxx @@ -28,25 +28,21 @@ using namespace ::com::sun::star; *************************************************************************/ TYPEINIT1_AUTOFACTORY( DiaEffectItem, SfxEnumItem ); - DiaEffectItem::DiaEffectItem( presentation::FadeEffect eFE ) : SfxEnumItem( ATTR_DIA_EFFECT, (sal_uInt16)eFE ) { } - DiaEffectItem::DiaEffectItem( SvStream& rIn ) : SfxEnumItem( ATTR_DIA_EFFECT, rIn ) { } - SfxPoolItem* DiaEffectItem::Clone( SfxItemPool* ) const { return new DiaEffectItem( *this ); } - SfxPoolItem* DiaEffectItem::Create( SvStream& rIn, sal_uInt16 ) const { return new DiaEffectItem( rIn ); @@ -59,25 +55,21 @@ SfxPoolItem* DiaEffectItem::Create( SvStream& rIn, sal_uInt16 ) const *************************************************************************/ TYPEINIT1_AUTOFACTORY( DiaSpeedItem, SfxEnumItem ); - DiaSpeedItem::DiaSpeedItem( FadeSpeed eFS ) : SfxEnumItem( ATTR_DIA_SPEED, (sal_uInt16)eFS ) { } - DiaSpeedItem::DiaSpeedItem( SvStream& rIn ) : SfxEnumItem( ATTR_DIA_SPEED, rIn ) { } - SfxPoolItem* DiaSpeedItem::Clone( SfxItemPool* ) const { return new DiaSpeedItem( *this ); } - SfxPoolItem* DiaSpeedItem::Create( SvStream& rIn, sal_uInt16 ) const { return new DiaSpeedItem( rIn ); @@ -95,19 +87,16 @@ DiaAutoItem::DiaAutoItem( PresChange eChange ) : { } - DiaAutoItem::DiaAutoItem( SvStream& rIn ) : SfxEnumItem( ATTR_DIA_AUTO, rIn ) { } - SfxPoolItem* DiaAutoItem::Clone( SfxItemPool* ) const { return new DiaAutoItem( *this ); } - SfxPoolItem* DiaAutoItem::Create( SvStream& rIn, sal_uInt16 ) const { return new DiaAutoItem( rIn ); @@ -120,24 +109,19 @@ SfxPoolItem* DiaAutoItem::Create( SvStream& rIn, sal_uInt16 ) const *************************************************************************/ TYPEINIT1_AUTOFACTORY( DiaTimeItem, SfxUInt32Item ); - DiaTimeItem::DiaTimeItem( sal_uInt32 nValue ) : SfxUInt32Item( ATTR_DIA_TIME, nValue ) { } - SfxPoolItem* DiaTimeItem::Clone( SfxItemPool* ) const { return new DiaTimeItem( *this ); } - bool DiaTimeItem::operator==( const SfxPoolItem& rItem ) const { return( ( (DiaTimeItem&) rItem ).GetValue() == GetValue() ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/core/sdobjfac.cxx b/sd/source/core/sdobjfac.cxx index 1d3fac54a0bd..90dbe551a17e 100644 --- a/sd/source/core/sdobjfac.cxx +++ b/sd/source/core/sdobjfac.cxx @@ -27,7 +27,6 @@ #include "imapinfo.hxx" #include "drawdoc.hxx" - SdObjectFactory aSdObjectFactory; /************************************************************************* @@ -64,5 +63,4 @@ IMPL_LINK( SdObjectFactory, MakeUserData, SdrObjFactory *, pObjFactory ) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index c718ed2f9faf..bfe91d37ceb9 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <algorithm> #include <comphelper/classids.hxx> @@ -1102,7 +1101,6 @@ Rectangle SdPage::GetTitleRect() const return aTitleRect; } - /************************************************************************* |* |* return outline area @@ -1148,7 +1146,6 @@ Rectangle SdPage::GetLayoutRect() const return aLayoutRect; } - /************************************************************************** |* |* assign a AutoLayout @@ -1392,7 +1389,6 @@ static void CalcAutoLayoutRectangles( SdPage& rPage,Rectangle* rRectangle ,const } } - void findAutoLayoutShapesImpl( SdPage& rPage, const LayoutDescriptor& rDescriptor, std::vector< SdrObject* >& rShapes, bool bInit, bool bSwitchLayout ) { int i; @@ -1687,8 +1683,6 @@ SdrObject* SdPage::ReplaceObject(SdrObject* pNewObj, sal_uLong nObjNum) return FmFormPage::ReplaceObject(pNewObj, nObjNum); } - - // called after a shape is removed or replaced from this slide void SdPage::onRemoveObject( SdrObject* pObject ) @@ -2307,7 +2301,6 @@ SdrObject* SdPage::InsertAutoLayoutShape( SdrObject* pObj, PresObjKind eObjKind, return pObj; } - /************************************************************************* |* |* Returns the PresObjKind of a object @@ -2514,7 +2507,6 @@ void SdPage::SetLayoutName(const OUString& aName) } } - /************************************************************************* |* |* Return the page name and generates it if necessary @@ -3066,17 +3058,11 @@ void SdPage::CalculateHandoutAreas( SdDrawDocument& rModel, AutoLayout eLayout, } } - - - void SdPage::SetPrecious (const bool bIsPrecious) { mbIsPrecious = bIsPrecious; } - - - HeaderFooterSettings::HeaderFooterSettings() { mbHeaderVisible = true; diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx index c3b80fbfc937..9d4a0272852b 100644 --- a/sd/source/core/sdpage2.cxx +++ b/sd/source/core/sdpage2.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vector> #include <boost/ptr_container/ptr_vector.hpp> @@ -251,7 +250,6 @@ void SdPage::SetPresentationLayout(const OUString& rLayoutName, } } - /************************************************************************* |* |* disconnect outline text object from templates for outline levels @@ -343,7 +341,6 @@ void SdPage::ConnectLink() } } - /************************************************************************* |* |* Disconnect from sfx2::LinkManager @@ -418,8 +415,6 @@ SdPage::SdPage(const SdPage& rSrcPage) mpPageLink = NULL; // is set when inserting via ConnectLink() } - - /************************************************************************* |* |* Clone @@ -462,7 +457,6 @@ SdrPage* SdPage::Clone(SdrModel* pNewModel) const |* \************************************************************************/ - SfxStyleSheet* SdPage::GetTextStyleSheetForObject( SdrObject* pObj ) const { const PresObjKind eKind = ((SdPage*)this)->GetPresObjKind(pObj); @@ -482,7 +476,6 @@ SfxItemSet* SdPage::getOrCreateItems() return mpItems; } - bool SdPage::setAlienAttributes( const com::sun::star::uno::Any& rAttributes ) { SfxItemSet* pSet = getOrCreateItems(); @@ -528,35 +521,30 @@ void SdPage::RemoveEmptyPresentationObjects() } } - void SdPage::setTransitionType( sal_Int16 nTransitionType ) { mnTransitionType = nTransitionType; ActionChanged(); } - void SdPage::setTransitionSubtype ( sal_Int16 nTransitionSubtype ) { mnTransitionSubtype = nTransitionSubtype; ActionChanged(); } - void SdPage::setTransitionDirection ( bool bTransitionbDirection ) { mbTransitionDirection = bTransitionbDirection; ActionChanged(); } - void SdPage::setTransitionFadeColor ( sal_Int32 nTransitionFadeColor ) { mnTransitionFadeColor = nTransitionFadeColor; ActionChanged(); } - void SdPage::setTransitionDuration ( double fTranstionDuration ) { mfTransitionDuration = fTranstionDuration; diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx index d59d6c1f99b1..fc40f112291f 100644 --- a/sd/source/core/stlfamily.cxx +++ b/sd/source/core/stlfamily.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/IllegalAccessException.hpp> #include <cppuhelper/supportsservice.hxx> @@ -46,8 +45,6 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::style; using namespace ::com::sun::star::beans; - - typedef std::map< OUString, rtl::Reference< SdStyleSheet > > PresStyleMap; struct SdStyleFamilyImpl @@ -94,8 +91,6 @@ PresStyleMap& SdStyleFamilyImpl::getStyleSheets() return maStyleSheets; } - - SdStyleFamily::SdStyleFamily( const rtl::Reference< SfxStyleSheetPool >& xPool, SfxStyleFamily nFamily ) : mnFamily( nFamily ) , mxPool( xPool ) @@ -103,8 +98,6 @@ SdStyleFamily::SdStyleFamily( const rtl::Reference< SfxStyleSheetPool >& xPool, { } - - SdStyleFamily::SdStyleFamily( const rtl::Reference< SfxStyleSheetPool >& xPool, const SdPage* pMasterPage ) : mnFamily( SD_STYLE_FAMILY_MASTERPAGE ) , mxPool( xPool ) @@ -114,24 +107,18 @@ SdStyleFamily::SdStyleFamily( const rtl::Reference< SfxStyleSheetPool >& xPool, mpImpl->mxPool = xPool; } - - SdStyleFamily::~SdStyleFamily() { DBG_ASSERT( !mxPool.is(), "SdStyleFamily::~SdStyleFamily(), dispose me first!" ); delete mpImpl; } - - void SdStyleFamily::throwIfDisposed() const throw(RuntimeException) { if( !mxPool.is() ) throw DisposedException(); } - - SdStyleSheet* SdStyleFamily::GetValidNewSheet( const Any& rElement ) throw(IllegalArgumentException) { Reference< XStyle > xStyle( rElement, UNO_QUERY ); @@ -218,16 +205,12 @@ OUString SAL_CALL SdStyleFamily::getName() throw (RuntimeException, std::excepti } } - - void SAL_CALL SdStyleFamily::setName( const OUString& ) throw (RuntimeException, std::exception) { } - // XNameAccess - Any SAL_CALL SdStyleFamily::getByName( const OUString& rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -235,8 +218,6 @@ Any SAL_CALL SdStyleFamily::getByName( const OUString& rName ) throw(NoSuchEleme return Any( Reference< XStyle >( static_cast<SfxUnoStyleSheet*>(GetSheetByName( rName )) ) ); } - - Sequence< OUString > SAL_CALL SdStyleFamily::getElementNames() throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -279,8 +260,6 @@ Sequence< OUString > SAL_CALL SdStyleFamily::getElementNames() throw(RuntimeExce } } - - sal_Bool SAL_CALL SdStyleFamily::hasByName( const OUString& aName ) throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -316,17 +295,13 @@ sal_Bool SAL_CALL SdStyleFamily::hasByName( const OUString& aName ) throw(Runtim return sal_False; } - // XElementAccess - Type SAL_CALL SdStyleFamily::getElementType() throw(RuntimeException, std::exception) { return cppu::UnoType<XStyle>::get(); } - - sal_Bool SAL_CALL SdStyleFamily::hasElements() throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -348,10 +323,8 @@ sal_Bool SAL_CALL SdStyleFamily::hasElements() throw(RuntimeException, std::exce return sal_False; } - // XIndexAccess - sal_Int32 SAL_CALL SdStyleFamily::getCount() throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -375,8 +348,6 @@ sal_Int32 SAL_CALL SdStyleFamily::getCount() throw(RuntimeException, std::except return nCount; } - - Any SAL_CALL SdStyleFamily::getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -416,10 +387,8 @@ Any SAL_CALL SdStyleFamily::getByIndex( sal_Int32 Index ) throw(IndexOutOfBounds throw IndexOutOfBoundsException(); } - // XNameContainer - void SAL_CALL SdStyleFamily::insertByName( const OUString& rName, const Any& rElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -436,8 +405,6 @@ void SAL_CALL SdStyleFamily::insertByName( const OUString& rName, const Any& rEl mxPool->Insert( pStyle ); } - - void SAL_CALL SdStyleFamily::removeByName( const OUString& rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -451,10 +418,8 @@ void SAL_CALL SdStyleFamily::removeByName( const OUString& rName ) throw(NoSuchE mxPool->Remove( pStyle ); } - // XNameReplace - void SAL_CALL SdStyleFamily::replaceByName( const OUString& rName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -467,10 +432,8 @@ void SAL_CALL SdStyleFamily::replaceByName( const OUString& rName, const Any& aE mxPool->Insert( pNewStyle ); } - // XSingleServiceFactory - Reference< XInterface > SAL_CALL SdStyleFamily::createInstance() throw(Exception, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -486,17 +449,13 @@ Reference< XInterface > SAL_CALL SdStyleFamily::createInstance() throw(Exception } } - - Reference< XInterface > SAL_CALL SdStyleFamily::createInstanceWithArguments( const Sequence< Any >& ) throw(Exception, RuntimeException, std::exception) { return createInstance(); } - // XComponent - void SAL_CALL SdStyleFamily::dispose( ) throw (RuntimeException, std::exception) { if( mxPool.is() ) @@ -509,37 +468,27 @@ void SAL_CALL SdStyleFamily::dispose( ) throw (RuntimeException, std::exception } } - - void SAL_CALL SdStyleFamily::addEventListener( const Reference< XEventListener >& ) throw (RuntimeException, std::exception) { } - - void SAL_CALL SdStyleFamily::removeEventListener( const Reference< XEventListener >& ) throw (RuntimeException, std::exception) { } - // XPropertySet - Reference<XPropertySetInfo> SdStyleFamily::getPropertySetInfo() throw (RuntimeException, std::exception) { OSL_FAIL( "###unexpected!" ); return Reference<XPropertySetInfo>(); } - - void SdStyleFamily::setPropertyValue( const OUString& , const Any& ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { OSL_FAIL( "###unexpected!" ); } - - Any SdStyleFamily::getPropertyValue( const OUString& PropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { if ( PropertyName == "DisplayName" ) @@ -560,29 +509,21 @@ Any SdStyleFamily::getPropertyValue( const OUString& PropertyName ) throw (Unkno } } - - void SdStyleFamily::addPropertyChangeListener( const OUString& , const Reference<XPropertyChangeListener>& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { OSL_FAIL( "###unexpected!" ); } - - void SdStyleFamily::removePropertyChangeListener( const OUString& , const Reference<XPropertyChangeListener>& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { OSL_FAIL( "###unexpected!" ); } - - void SdStyleFamily::addVetoableChangeListener( const OUString& , const Reference<XVetoableChangeListener>& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { OSL_FAIL( "###unexpected!" ); } - - void SdStyleFamily::removeVetoableChangeListener( const OUString& , const Reference<XVetoableChangeListener>& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { OSL_FAIL( "###unexpected!" ); diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index cb81501feed9..0b7f863687c6 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/lang/DisposedException.hpp> #include <cppuhelper/supportsservice.hxx> #include <editeng/eeitem.hxx> @@ -100,8 +99,6 @@ SfxStyleSheet *lcl_findStyle(SdStyleSheetVector& rStyles, const OUString& aStyle } - - SdStyleSheetPool::SdStyleSheetPool(SfxItemPool const& _rPool, SdDrawDocument* pDocument) : SdStyleSheetPoolBase( _rPool ) , mpActualStyleSheet(NULL) @@ -133,22 +130,16 @@ SdStyleSheetPool::~SdStyleSheetPool() DBG_ASSERT( mpDoc == NULL, "sd::SdStyleSheetPool::~SdStyleSheetPool(), dispose me first!" ); } - - SfxStyleSheetBase* SdStyleSheetPool::Create(const OUString& rName, SfxStyleFamily eFamily, sal_uInt16 _nMask ) { return new SdStyleSheet(rName, *this, eFamily, _nMask); } - - SfxStyleSheetBase* SdStyleSheetPool::Create(const SdStyleSheet& rStyle) { return new SdStyleSheet( rStyle ); } - - SfxStyleSheetBase* SdStyleSheetPool::GetTitleSheet(const OUString& rLayoutName) { OUString aName(rLayoutName); @@ -735,7 +726,6 @@ void SdStyleSheetPool::CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily Reindex(); } - /************************************************************************* |* |* Copy style sheets of the named presentation layout from the source pool into @@ -927,7 +917,6 @@ void SdStyleSheetPool::CreatePseudosIfNecessary() } } - /************************************************************************* |* |* Set the correct name in the program language to the standard styles @@ -1240,16 +1229,12 @@ Font SdStyleSheetPool::GetBulletFont() return aBulletFont; } - - void SdStyleSheetPool::AddStyleFamily( const SdPage* pPage ) { rtl::Reference< SfxStyleSheetPool > xPool( this ); maStyleFamilyMap[pPage] = new SdStyleFamily( xPool, pPage ); } - - void SdStyleSheetPool::RemoveStyleFamily( const SdPage* pPage ) { SdStyleFamilyMap::iterator iter( maStyleFamilyMap.find( pPage ) ); @@ -1268,8 +1253,6 @@ void SdStyleSheetPool::RemoveStyleFamily( const SdPage* pPage ) } } - - void SdStyleSheetPool::throwIfDisposed() throw(::com::sun::star::uno::RuntimeException) { if( mpDoc == NULL ) @@ -1316,8 +1299,6 @@ Any SAL_CALL SdStyleSheetPool::getByName( const OUString& aName ) throw(NoSuchEl throw NoSuchElementException(); } - - Sequence< OUString > SAL_CALL SdStyleSheetPool::getElementNames() throw(RuntimeException, std::exception) { throwIfDisposed(); @@ -1337,8 +1318,6 @@ Sequence< OUString > SAL_CALL SdStyleSheetPool::getElementNames() throw(RuntimeE return aNames; } - - sal_Bool SAL_CALL SdStyleSheetPool::hasByName( const OUString& aName ) throw(RuntimeException, std::exception) { throwIfDisposed(); @@ -1361,10 +1340,8 @@ sal_Bool SAL_CALL SdStyleSheetPool::hasByName( const OUString& aName ) throw(Run return sal_False; } - // XElementAccess - Type SAL_CALL SdStyleSheetPool::getElementType() throw(RuntimeException, std::exception) { throwIfDisposed(); @@ -1372,17 +1349,13 @@ Type SAL_CALL SdStyleSheetPool::getElementType() throw(RuntimeException, std::ex return cppu::UnoType<XNameAccess>::get(); } - - sal_Bool SAL_CALL SdStyleSheetPool::hasElements() throw(RuntimeException, std::exception) { return sal_True; } - // XIndexAccess - sal_Int32 SAL_CALL SdStyleSheetPool::getCount() throw(RuntimeException, std::exception) { throwIfDisposed(); @@ -1390,8 +1363,6 @@ sal_Int32 SAL_CALL SdStyleSheetPool::getCount() throw(RuntimeException, std::exc return maStyleFamilyMap.size() + 3; } - - Any SAL_CALL SdStyleSheetPool::getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) { switch( Index ) @@ -1419,10 +1390,8 @@ Any SAL_CALL SdStyleSheetPool::getByIndex( sal_Int32 Index ) throw(IndexOutOfBou } } - // XComponent - void SAL_CALL SdStyleSheetPool::dispose() throw (RuntimeException, std::exception) { if( mpDoc ) @@ -1454,20 +1423,14 @@ void SAL_CALL SdStyleSheetPool::dispose() throw (RuntimeException, std::exceptio } } - - void SAL_CALL SdStyleSheetPool::addEventListener( const Reference< XEventListener >& /*xListener*/ ) throw (RuntimeException, std::exception) { } - - void SAL_CALL SdStyleSheetPool::removeEventListener( const Reference< XEventListener >& /*aListener*/ ) throw (RuntimeException, std::exception) { } - - SdStyleSheetVector SdStyleSheetPool::CreateChildList( SdStyleSheet* pSheet ) { SdStyleSheetVector aResult; @@ -1485,8 +1448,6 @@ SdStyleSheetVector SdStyleSheetPool::CreateChildList( SdStyleSheet* pSheet ) return aResult; } - - void SAL_CALL SdStyleSheetPool::acquire (void) throw () { SdStyleSheetPoolBase::acquire(); @@ -1497,6 +1458,4 @@ void SAL_CALL SdStyleSheetPool::release (void) throw () SdStyleSheetPoolBase::release(); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index ec7512da3e7b..dacc6ae2a129 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/style/XStyle.hpp> @@ -167,7 +166,6 @@ OUString SdStyleSheet::GetApiName() const return GetName(); } - void SdStyleSheet::Load (SvStream& rIn, sal_uInt16 nVersion) { SfxStyleSheetBase::Load(rIn, nVersion); @@ -179,13 +177,11 @@ void SdStyleSheet::Load (SvStream& rIn, sal_uInt16 nVersion) nMask &= ~SFXSTYLEBIT_READONLY; } - void SdStyleSheet::Store(SvStream& rOut) { SfxStyleSheetBase::Store(rOut); } - bool SdStyleSheet::SetParent(const OUString& rParentName) { bool bResult = false; @@ -524,7 +520,6 @@ SdStyleSheet* SdStyleSheet::GetPseudoStyleSheet() const return pPseudoStyle; } - void SdStyleSheet::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) { // first, base class functionality @@ -604,22 +599,16 @@ void SdStyleSheet::AdjustToFontHeight(SfxItemSet& rSet, bool bOnlyMissingItems) } } - - bool SdStyleSheet::HasFollowSupport() const { return false; } - - bool SdStyleSheet::HasParentSupport() const { return true; } - - bool SdStyleSheet::HasClearParentSupport() const { return true; @@ -685,8 +674,6 @@ void SdStyleSheet::SetHelpId( const OUString& r, sal_uLong nId ) } } - - OUString SdStyleSheet::GetFamilyString( SfxStyleFamily eFamily ) { switch( eFamily ) @@ -700,16 +687,12 @@ OUString SdStyleSheet::GetFamilyString( SfxStyleFamily eFamily ) } } - - void SdStyleSheet::throwIfDisposed() throw (RuntimeException) { if( !mxPool.is() ) throw DisposedException(); } - - SdStyleSheet* SdStyleSheet::CreateEmptyUserStyle( SfxStyleSheetBasePool& rPool, SfxStyleFamily eFamily ) { OUString aPrefix( "user" ); @@ -724,10 +707,8 @@ SdStyleSheet* SdStyleSheet::CreateEmptyUserStyle( SfxStyleSheetBasePool& rPool, return new SdStyleSheet(aName, rPool, eFamily, SFXSTYLEBIT_USERDEF); } - // XInterface - void SAL_CALL SdStyleSheet::release( ) throw () { if (osl_atomic_decrement( &m_refCount ) == 0) @@ -750,10 +731,8 @@ void SAL_CALL SdStyleSheet::release( ) throw () } } - // XComponent - void SAL_CALL SdStyleSheet::dispose( ) throw (RuntimeException, std::exception) { ClearableMutexGuard aGuard( mrBHelper.rMutex ); @@ -794,15 +773,11 @@ void SAL_CALL SdStyleSheet::dispose( ) throw (RuntimeException, std::exception) } } - - void SdStyleSheet::disposing() { mxPool.clear(); } - - void SAL_CALL SdStyleSheet::addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException, std::exception) { ClearableMutexGuard aGuard( mrBHelper.rMutex ); @@ -818,17 +793,13 @@ void SAL_CALL SdStyleSheet::addEventListener( const Reference< XEventListener >& } } - - void SAL_CALL SdStyleSheet::removeEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException, std::exception) { mrBHelper.removeListener( ::getCppuType( &xListener ), xListener ); } - // XModifyBroadcaster - void SAL_CALL SdStyleSheet::addModifyListener( const Reference< XModifyListener >& xListener ) throw (RuntimeException, std::exception) { ClearableMutexGuard aGuard( mrBHelper.rMutex ); @@ -846,15 +817,11 @@ void SAL_CALL SdStyleSheet::addModifyListener( const Reference< XModifyListener } } - - void SAL_CALL SdStyleSheet::removeModifyListener( const Reference< XModifyListener >& xListener ) throw (RuntimeException, std::exception) { mrBHelper.removeListener( cppu::UnoType<XModifyListener>::get(), xListener ); } - - void SdStyleSheet::notifyModifyListener() { MutexGuard aGuard( mrBHelper.rMutex ); @@ -905,8 +872,6 @@ OUString SAL_CALL SdStyleSheet::getName() throw(RuntimeException, std::exception return GetApiName(); } - - void SAL_CALL SdStyleSheet::setName( const OUString& rName ) throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -919,10 +884,8 @@ void SAL_CALL SdStyleSheet::setName( const OUString& rName ) throw(RuntimeExcep } } - // XStyle - sal_Bool SAL_CALL SdStyleSheet::isUserDefined() throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -930,8 +893,6 @@ sal_Bool SAL_CALL SdStyleSheet::isUserDefined() throw(RuntimeException, std::exc return IsUserDefined() ? sal_True : sal_False; } - - sal_Bool SAL_CALL SdStyleSheet::isInUse() throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -939,8 +900,6 @@ sal_Bool SAL_CALL SdStyleSheet::isInUse() throw(RuntimeException, std::exception return IsUsed() ? sal_True : sal_False; } - - OUString SAL_CALL SdStyleSheet::getParentStyle() throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -955,8 +914,6 @@ OUString SAL_CALL SdStyleSheet::getParentStyle() throw(RuntimeException, std::ex return OUString(); } - - void SAL_CALL SdStyleSheet::setParentStyle( const OUString& rParentName ) throw(NoSuchElementException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -986,10 +943,8 @@ void SAL_CALL SdStyleSheet::setParentStyle( const OUString& rParentName ) throw } } - // XPropertySet - Reference< XPropertySetInfo > SdStyleSheet::getPropertySetInfo() throw(RuntimeException, std::exception) { throwIfDisposed(); @@ -999,8 +954,6 @@ Reference< XPropertySetInfo > SdStyleSheet::getPropertySetInfo() throw(RuntimeEx return xInfo; } - - void SAL_CALL SdStyleSheet::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1087,8 +1040,6 @@ void SAL_CALL SdStyleSheet::setPropertyValue( const OUString& aPropertyName, con } } - - Any SAL_CALL SdStyleSheet::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1184,17 +1135,13 @@ Any SAL_CALL SdStyleSheet::getPropertyValue( const OUString& PropertyName ) thro } } - - void SAL_CALL SdStyleSheet::addPropertyChangeListener( const OUString& , const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) {} void SAL_CALL SdStyleSheet::removePropertyChangeListener( const OUString& , const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) {} void SAL_CALL SdStyleSheet::addVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) {} void SAL_CALL SdStyleSheet::removeVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) {} - // XPropertyState - PropertyState SAL_CALL SdStyleSheet::getPropertyState( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1272,8 +1219,6 @@ PropertyState SAL_CALL SdStyleSheet::getPropertyState( const OUString& PropertyN } } - - Sequence< PropertyState > SAL_CALL SdStyleSheet::getPropertyStates( const Sequence< OUString >& aPropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1292,8 +1237,6 @@ Sequence< PropertyState > SAL_CALL SdStyleSheet::getPropertyStates( const Sequen return aPropertyStateSequence; } - - void SAL_CALL SdStyleSheet::setPropertyToDefault( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1318,8 +1261,6 @@ void SAL_CALL SdStyleSheet::setPropertyToDefault( const OUString& PropertyName ) Broadcast(SfxSimpleHint(SFX_HINT_DATACHANGED)); } - - Any SAL_CALL SdStyleSheet::getPropertyDefault( const OUString& aPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx index b705e417d6ae..98a06fec314c 100644 --- a/sd/source/core/text/textapi.cxx +++ b/sd/source/core/text/textapi.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/text/XTextField.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> @@ -30,7 +29,6 @@ #include "Outliner.hxx" #include <svx/svdpool.hxx> - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; using namespace ::com::sun::star::beans; diff --git a/sd/source/core/undo/undomanager.cxx b/sd/source/core/undo/undomanager.cxx index f790de5c9eab..801c63ab3226 100644 --- a/sd/source/core/undo/undomanager.cxx +++ b/sd/source/core/undo/undomanager.cxx @@ -49,15 +49,11 @@ void UndoManager::AddUndoAction( SfxUndoAction *pAction, bool bTryMerg /* = sal_ } } - void UndoManager::SetLinkedUndoManager (::svl::IUndoManager* pLinkedUndoManager) { mpLinkedUndoManager = pLinkedUndoManager; } - - - void UndoManager::ClearLinkedRedoActions (void) { if (mpLinkedUndoManager != NULL) diff --git a/sd/source/core/undoanim.cxx b/sd/source/core/undoanim.cxx index 4c7de1454a8c..f27e9c71c068 100644 --- a/sd/source/core/undoanim.cxx +++ b/sd/source/core/undoanim.cxx @@ -37,7 +37,6 @@ using ::com::sun::star::uno::UNO_QUERY_THROW; using ::com::sun::star::util::XCloneable; using namespace ::com::sun::star::animations; - namespace sd { diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx index 5ef8987574d9..1e4159023abb 100644 --- a/sd/source/filter/cgm/sdcgmfilter.cxx +++ b/sd/source/filter/cgm/sdcgmfilter.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <osl/module.hxx> #include <tools/urlobj.hxx> #include <svl/itemset.hxx> diff --git a/sd/source/filter/eppt/epptdef.hxx b/sd/source/filter/eppt/epptdef.hxx index fbe824cc65e6..e4f88bb18a2b 100644 --- a/sd/source/filter/eppt/epptdef.hxx +++ b/sd/source/filter/eppt/epptdef.hxx @@ -204,7 +204,6 @@ #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 diff --git a/sd/source/filter/eppt/escherex.cxx b/sd/source/filter/eppt/escherex.cxx index 0c5eece7c96d..48b8b8a648ba 100644 --- a/sd/source/filter/eppt/escherex.cxx +++ b/sd/source/filter/eppt/escherex.cxx @@ -19,10 +19,6 @@ #include "escherex.hxx" - - - - PptEscherEx::PptEscherEx( SvStream& rOutStrm, const OUString& rBaseURI ) : EscherEx( EscherExGlobalRef( new EscherExGlobal ), &rOutStrm ) { @@ -30,8 +26,6 @@ PptEscherEx::PptEscherEx( SvStream& rOutStrm, const OUString& rBaseURI ) : mnCurrentDg = 0; } - - sal_uInt32 PptEscherEx::DrawingGroupContainerSize() { return ImplDggContainerSize() + 8; @@ -46,8 +40,6 @@ void PptEscherEx::WriteDrawingGroupContainer( SvStream& rSt ) ImplWriteDggContainer( rSt ); } - - sal_uInt32 PptEscherEx::ImplDggContainerSize() { sal_uInt32 nSize; @@ -76,8 +68,6 @@ void PptEscherEx::ImplWriteDggContainer( SvStream& rSt ) } } - - #define ESCHER_OPT_COUNT 6 sal_uInt32 PptEscherEx::ImplOptAtomSize() @@ -104,8 +94,6 @@ void PptEscherEx::ImplWriteOptAtom( SvStream& rSt ) } } - - #define ESCHER_SPLIT_MENU_COLORS_COUNT 4 sal_uInt32 PptEscherEx::ImplSplitMenuColorsAtomSize() @@ -131,14 +119,10 @@ void PptEscherEx::ImplWriteSplitMenuColorsAtom( SvStream& rSt ) } - - PptEscherEx::~PptEscherEx() { } - - void PptEscherEx::OpenContainer( sal_uInt16 n_EscherContainer, int nRecInstance ) { mpOutStrm->WriteUInt16( (sal_uInt16)( ( nRecInstance << 4 ) | 0xf ) ).WriteUInt16( n_EscherContainer ).WriteUInt32( (sal_uInt32)0 ); @@ -175,8 +159,6 @@ void PptEscherEx::OpenContainer( sal_uInt16 n_EscherContainer, int nRecInstance } } - - void PptEscherEx::CloseContainer() { /* SJ: #Issue 26747# @@ -221,8 +203,6 @@ void PptEscherEx::CloseContainer() } } - - sal_uInt32 PptEscherEx::EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClientData ) { sal_uInt32 nShapeId = 0; @@ -284,6 +264,4 @@ 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 40e1caa61648..de87bfe01e78 100644 --- a/sd/source/filter/eppt/pptexanimations.cxx +++ b/sd/source/filter/eppt/pptexanimations.cxx @@ -273,8 +273,6 @@ AnimationExporter::AnimationExporter( const EscherSolverContainer& rSolverContai { } - - sal_Int16 AnimationExporter::GetFillMode( const Reference< XAnimationNode >& xNode, const sal_Int16 nFillDefault ) { sal_Int16 nFill = xNode->getFill(); diff --git a/sd/source/filter/eppt/pptexsoundcollection.cxx b/sd/source/filter/eppt/pptexsoundcollection.cxx index 1ebeb6fcd51f..d7d86bd2fa01 100644 --- a/sd/source/filter/eppt/pptexsoundcollection.cxx +++ b/sd/source/filter/eppt/pptexsoundcollection.cxx @@ -209,7 +209,6 @@ void ExSoundCollection::Write( SvStream& rSt ) const } } - } // namespace ppt; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index 980befa27606..ba4e20238248 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -1226,7 +1226,6 @@ void PowerPointExport::WriteAnimations( FSHelperPtr pFS ) } } - static OUString lcl_GetInitials( const OUString& sName ) { OUStringBuffer sRet; diff --git a/sd/source/filter/eppt/pptx-grouptable.cxx b/sd/source/filter/eppt/pptx-grouptable.cxx index 24c398f5a46f..43f1e33ea02a 100644 --- a/sd/source/filter/eppt/pptx-grouptable.cxx +++ b/sd/source/filter/eppt/pptx-grouptable.cxx @@ -52,8 +52,6 @@ void GroupTable::ImplResizeGroupTable( sal_uInt32 nEntrys ) } } - - bool GroupTable::EnterGroup( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rXIndexAccessRef ) { bool bRet = false; @@ -73,8 +71,6 @@ bool GroupTable::EnterGroup( ::com::sun::star::uno::Reference< ::com::sun::star: return bRet; } - - sal_uInt32 GroupTable::GetGroupsClosed() { sal_uInt32 nRet = mnGroupsClosed; @@ -82,24 +78,18 @@ sal_uInt32 GroupTable::GetGroupsClosed() return nRet; } - - void GroupTable::ClearGroupTable() { for ( sal_uInt32 i = 0; i < mnCurrentGroupEntry; i++, delete mpGroupEntry[ i ] ) ; mnCurrentGroupEntry = 0; } - - void GroupTable::ResetGroupTable( sal_uInt32 nCount ) { ClearGroupTable(); mpGroupEntry[ mnCurrentGroupEntry++ ] = new GroupEntry( nCount ); } - - bool GroupTable::GetNextGroupEntry() { while ( mnCurrentGroupEntry ) @@ -117,6 +107,4 @@ bool GroupTable::GetNextGroupEntry() return false; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/filter/eppt/pptx-stylesheet.cxx b/sd/source/filter/eppt/pptx-stylesheet.cxx index 8cf5bcae9eb1..98e9de6351e8 100644 --- a/sd/source/filter/eppt/pptx-stylesheet.cxx +++ b/sd/source/filter/eppt/pptx-stylesheet.cxx @@ -69,7 +69,6 @@ PPTExCharSheet::PPTExCharSheet( int nInstance ) } } - void PPTExCharSheet::SetStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, FontCollection& rFontCollection, int nLevel ) { @@ -385,7 +384,6 @@ void PPTExParaSheet::Write( SvStream& rSt, PptEscherEx*, sal_uInt16 nLev, bool, } } - PPTExStyleSheet::PPTExStyleSheet( sal_uInt16 nDefaultTab, PPTExBulletProvider& rBuProv ) { for ( int nInstance = EPP_TEXTTYPE_Title; nInstance <= EPP_TEXTTYPE_QuarterBody; nInstance++ ) diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx index f5c1399bf347..feb67f663ca4 100644 --- a/sd/source/filter/grf/sdgrffilter.cxx +++ b/sd/source/filter/grf/sdgrffilter.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifdef _MSC_VER #pragma warning (disable:4190) #endif @@ -48,15 +47,12 @@ #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" #include "sdresid.hxx" @@ -88,9 +84,6 @@ using namespace ::com::sun::star::ucb; using namespace com::sun::star::ui::dialogs; using namespace ::sfx2; - - - class SdGRFFilter_ImplInteractionHdl : public ::cppu::WeakImplHelper1< com::sun::star::task::XInteractionHandler > { com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > m_xInter; @@ -128,24 +121,17 @@ void SdGRFFilter_ImplInteractionHdl::handle( const com::sun::star::uno::Referenc m_xInter->handle( xRequest ); } - - // - SdPPTFilter - - SdGRFFilter::SdGRFFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell ) : SdFilter( rMedium, rDocShell, true ) { } - - SdGRFFilter::~SdGRFFilter() { } - - void SdGRFFilter::HandleGraphicFilterError( sal_uInt16 nFilterError, sal_uLong nStreamError ) { sal_uInt16 nId; @@ -188,8 +174,6 @@ void SdGRFFilter::HandleGraphicFilterError( sal_uInt16 nFilterError, sal_uLong n } } - - bool SdGRFFilter::Import() { Graphic aGraphic; @@ -247,8 +231,6 @@ bool SdGRFFilter::Import() return bRet; } - - bool SdGRFFilter::Export() { // SJ: todo: error handling, the GraphicExportFilter does not support proper errorhandling diff --git a/sd/source/filter/html/HtmlOptionsDialog.cxx b/sd/source/filter/html/HtmlOptionsDialog.cxx index feb9ca4bbdcb..2945f525af73 100644 --- a/sd/source/filter/html/HtmlOptionsDialog.cxx +++ b/sd/source/filter/html/HtmlOptionsDialog.cxx @@ -120,28 +120,20 @@ 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() { OWeakObject::release(); @@ -170,7 +162,6 @@ Sequence< OUString > SAL_CALL SdHtmlOptionsDialog::getSupportedServiceNames() return SdHtmlOptionsDialog_getSupportedServiceNames(); } - // XPropertyAccess Sequence< PropertyValue > SdHtmlOptionsDialog::getPropertyValues() throw ( RuntimeException, std::exception ) diff --git a/sd/source/filter/html/buttonset.cxx b/sd/source/filter/html/buttonset.cxx index 4ff9f578777d..fbc76de77900 100644 --- a/sd/source/filter/html/buttonset.cxx +++ b/sd/source/filter/html/buttonset.cxx @@ -261,7 +261,6 @@ Reference< XGraphicProvider > ButtonSetImpl::getGraphicProvider() return mxGraphicProvider; } - ButtonSet::ButtonSet() : mpImpl( new ButtonSetImpl() ) { diff --git a/sd/source/filter/html/htmlattr.cxx b/sd/source/filter/html/htmlattr.cxx index 63502b499bf7..ebbce887eb1a 100644 --- a/sd/source/filter/html/htmlattr.cxx +++ b/sd/source/filter/html/htmlattr.cxx @@ -22,9 +22,6 @@ #include <vcl/decoview.hxx> #include <vcl/builder.hxx> - - - SdHtmlAttrPreview::SdHtmlAttrPreview( Window* pParent, WinBits nStyle ) :Control( pParent, nStyle ) { @@ -41,13 +38,10 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSdHtmlAttrPreview(Window *p return new SdHtmlAttrPreview(pParent, nWinStyle); } - SdHtmlAttrPreview::~SdHtmlAttrPreview() { } - - void SdHtmlAttrPreview::Paint( const Rectangle& rRect ) { DecorationView aDecoView( this ); @@ -83,8 +77,6 @@ void SdHtmlAttrPreview::Paint( const Rectangle& rRect ) TEXT_DRAW_CENTER|TEXT_DRAW_VCENTER ); } - - void SdHtmlAttrPreview::SetColors( Color& aBack, Color& aText, Color& aLink, Color& aVLink, Color& aALink ) { diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index 7876218c5ee3..e49327e6a7ef 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -171,7 +171,6 @@ public: OUString Flush(); }; - // close all still open tags OUString HtmlState::Flush() { @@ -187,7 +186,6 @@ OUString HtmlState::Flush() return aStr; } - // c'tor with default color for the page HtmlState::HtmlState( Color aDefColor ) { @@ -200,7 +198,6 @@ HtmlState::HtmlState( Color aDefColor ) maDefColor = aDefColor; } - // enables/disables bold print OUString HtmlState::SetWeight( bool bWeight ) { @@ -215,7 +212,6 @@ OUString HtmlState::SetWeight( bool bWeight ) return aStr; } - // enables/disables italic OUString HtmlState::SetItalic( bool bItalic ) @@ -231,7 +227,6 @@ OUString HtmlState::SetItalic( bool bItalic ) return aStr; } - // enables/disables underlines OUString HtmlState::SetUnderline( bool bUnderline ) @@ -247,7 +242,6 @@ OUString HtmlState::SetUnderline( bool bUnderline ) return aStr; } - // enables/disables strike through OUString HtmlState::SetStrikeout( bool bStrike ) { @@ -262,7 +256,6 @@ OUString HtmlState::SetStrikeout( bool bStrike ) return aStr; } - // Sets the specified text color OUString HtmlState::SetColor( Color aColor ) { @@ -287,7 +280,6 @@ OUString HtmlState::SetColor( Color aColor ) return aStr; } - // enables/disables a hyperlink OUString HtmlState::SetLink( const OUString& aLink, const OUString& aTarget ) { @@ -614,7 +606,6 @@ void HtmlExport::InitExportParameters( const Sequence< PropertyValue >& rParams mnHeightPixel = (sal_uInt16)(mnWidthPixel/dRatio); - // we come up with a destination... INetURLObject aINetURLObj( maPath ); @@ -741,8 +732,6 @@ void HtmlExport::ExportHtml() maDocFileName += ".odp"; } - - sal_uInt16 nProgrCount = mnSdPageCount; nProgrCount += mbImpress?mnSdPageCount:0; nProgrCount += mbContentsPage?1:0; @@ -769,7 +758,6 @@ void HtmlExport::ExportHtml() !CreateImagesForPresPages( true ) ) break; - if( !CreateHtmlForPresPages() ) break; @@ -864,16 +852,12 @@ void HtmlExport::InitProgress( sal_uInt16 nProgrCount ) mpProgress = new SfxProgress( mpDocSh, SD_RESSTR(STR_CREATE_PAGES), nProgrCount ); } - - void HtmlExport::ResetProgress() { delete mpProgress; mpProgress = NULL; } - - void HtmlExport::ExportKiosk() { mnPagesWritten = 0; @@ -889,7 +873,6 @@ void HtmlExport::ExportKiosk() ResetProgress(); } - // Export Document with WebCast (TM) Technology void HtmlExport::ExportWebCast() { @@ -952,7 +935,6 @@ void HtmlExport::ExportWebCast() ResetProgress(); } - // Save the presentation as a downloadable file in the dest directory bool HtmlExport::SavePresentation() { @@ -988,7 +970,6 @@ bool HtmlExport::SavePresentation() return false; } - // create image files bool HtmlExport::CreateImagesForPresPages( bool bThumbnail) { @@ -1034,7 +1015,6 @@ bool HtmlExport::CreateImagesForPresPages( bool bThumbnail) else aFull += maImageFiles[nSdPage]; - aDescriptor[0].Value <<= aFull; Reference< XComponent > xPage( pPage->getUnoPage(), UNO_QUERY ); @@ -1053,7 +1033,6 @@ bool HtmlExport::CreateImagesForPresPages( bool bThumbnail) return true; } - // get SdrTextObject with layout text of this page SdrTextObj* HtmlExport::GetLayoutTextObject(SdrPage* pPage) { @@ -1074,7 +1053,6 @@ SdrTextObj* HtmlExport::GetLayoutTextObject(SdrPage* pPage) return pResult; } - // create HTML text version of impress pages OUString HtmlExport::CreateMetaCharset() const { @@ -1207,8 +1185,6 @@ bool HtmlExport::WriteHtml( const OUString& rFileName, bool bAddExtension, const return nErr == 0; } - - /** creates a outliner text for the title objects of a page */ OUString HtmlExport::CreateTextForTitle( SdrOutliner* pOutliner, SdPage* pPage, const Color& rBackgroundColor ) @@ -1231,7 +1207,6 @@ OUString HtmlExport::CreateTextForTitle( SdrOutliner* pOutliner, SdPage* pPage, return OUString(); } - // creates a outliner text for a page OUString HtmlExport::CreateTextForPage(SdrOutliner* pOutliner, SdPage* pPage, bool bHeadLine, const Color& rBackgroundColor) @@ -1433,7 +1408,6 @@ OUString HtmlExport::CreateTextForNotesPage( SdrOutliner* pOutliner, return aStr.makeStringAndClear(); } - // converts a paragraph of the outliner to html OUString HtmlExport::ParagraphToHTMLString( SdrOutliner* pOutliner, sal_Int32 nPara, const Color& rBackgroundColor ) { @@ -1477,7 +1451,6 @@ OUString HtmlExport::ParagraphToHTMLString( SdrOutliner* pOutliner, sal_Int32 nP return aStr.makeStringAndClear(); } - // Depending on the attributes of the specified set and the specified // HtmlState, it creates the needed html tags in order to get the // attributes @@ -1568,7 +1541,6 @@ OUString HtmlExport::TextAttribToHTMLString( SfxItemSet* pSet, HtmlState* pState return aStr.makeStringAndClear(); } - // create HTML wrapper for picture files bool HtmlExport::CreateHtmlForPresPages() { @@ -1736,7 +1708,6 @@ bool HtmlExport::CreateHtmlForPresPages() aRect.Bottom() = (long)(aRect.Bottom() * fLogicToPixel); long nRadius = aRect.GetWidth() / 2; - /** insert areas into Imagemap of the object, if the object has such a Imagemap @@ -1823,8 +1794,6 @@ bool HtmlExport::CreateHtmlForPresPages() } } - - /** if there is a presentation::ClickAction, determine bookmark and create area for the whole object @@ -1941,7 +1910,6 @@ bool HtmlExport::CreateHtmlForPresPages() return bOk; } - // create overview pages bool HtmlExport::CreateContentPage() { @@ -2063,7 +2031,6 @@ bool HtmlExport::CreateContentPage() aStr.append("\r\n"); } - aStr.append("</td></tr></table></center>\r\n"); aStr.append("</body>\r\n</html>"); @@ -2076,7 +2043,6 @@ bool HtmlExport::CreateContentPage() return bOk; } - // create note pages (for frames) bool HtmlExport::CreateNotesPages() @@ -2115,7 +2081,6 @@ bool HtmlExport::CreateNotesPages() return bOk; } - // create outline pages (for frames) bool HtmlExport::CreateOutlinePages() @@ -2175,7 +2140,6 @@ bool HtmlExport::CreateOutlinePages() return bOk; } - // set file name void HtmlExport::CreateFileNames() { @@ -2320,7 +2284,6 @@ static const char * JS_CollapseOutline = " frames[\"outline\"].location.href = \"outline0.$EXT\";\r\n" "}\r\n\r\n"; - // create page with the frames bool HtmlExport::CreateFrames() @@ -2426,7 +2389,6 @@ bool HtmlExport::CreateFrames() return bOk; } - // create button bar for standard // we create the following html files // navbar0.htm navigation bar graphic for the first page @@ -2594,7 +2556,6 @@ bool HtmlExport::CreateNavBarFrames() return bOk; } - // create button bar for standard OUString HtmlExport::CreateNavBar( sal_uInt16 nSdPage, bool bIsText ) const { @@ -2717,7 +2678,6 @@ bool HtmlExport::CreateBitmaps() return true; } - // creates the <body> tag, including the specified color attributes OUString HtmlExport::CreateBodyTag() const { @@ -2747,7 +2707,6 @@ OUString HtmlExport::CreateBodyTag() const return aStr.makeStringAndClear(); } - // creates a hyperlink OUString HtmlExport::CreateLink( const OUString& aLink, const OUString& aText, @@ -2767,7 +2726,6 @@ OUString HtmlExport::CreateLink( const OUString& aLink, return aStr.makeStringAndClear(); } - // creates a image tag OUString HtmlExport::CreateImage( const OUString& aImage, const OUString& aAltText, sal_Int16 nWidth, @@ -2804,7 +2762,6 @@ OUString HtmlExport::CreateImage( const OUString& aImage, const OUString& aAltTe return aStr.makeStringAndClear(); } - // create area for a circle; we expect pixel coordinates OUString HtmlExport::ColorToHTMLString( Color aColor ) { @@ -2820,7 +2777,6 @@ OUString HtmlExport::ColorToHTMLString( Color aColor ) return aStr.makeStringAndClear(); } - // create area for a circle; we expect pixel coordinates OUString HtmlExport::CreateHTMLCircleArea( sal_uLong nRadius, sal_uLong nCenterX, @@ -2837,8 +2793,6 @@ OUString HtmlExport::CreateHTMLCircleArea( sal_uLong nRadius, return aStr; } - - // create area for a polygon; we expect pixel coordinates OUString HtmlExport::CreateHTMLPolygonArea( const ::basegfx::B2DPolyPolygon& rPolyPolygon, Size aShift, double fFactor, const OUString& rHRef ) const @@ -2874,7 +2828,6 @@ OUString HtmlExport::CreateHTMLPolygonArea( const ::basegfx::B2DPolyPolygon& rPo return aStr.makeStringAndClear(); } - // create area for a rectangle; we expect pixel coordinates OUString HtmlExport::CreateHTMLRectArea( const Rectangle& rRect, const OUString& rHRef ) const @@ -2890,7 +2843,6 @@ OUString HtmlExport::CreateHTMLRectArea( const Rectangle& rRect, return aStr; } - // escapes a string for html OUString HtmlExport::StringToHTMLString( const OUString& rString ) { @@ -2901,7 +2853,6 @@ OUString HtmlExport::StringToHTMLString( const OUString& rString ) return OUString( (char*)aMemStm.GetData(), nLength, RTL_TEXTENCODING_UTF8 ); } - // creates a url for a specific page OUString HtmlExport::CreatePageURL( sal_uInt16 nPgNum ) { @@ -3007,7 +2958,6 @@ bool HtmlExport::CreateASPScripts() return true; } - static const char *PERL_Scripts[] = { "webcast.pl", "common.pl", "editpic.pl", "poll.pl", "savepic.pl", "show.pl" }; // creates and saves the PERL scripts for WebShow @@ -3076,8 +3026,6 @@ bool HtmlExport::CreateImageNumberFile() return nErr == 0; } - - OUString HtmlExport::InsertSound( const OUString& rSoundFile ) { if (rSoundFile.isEmpty()) @@ -3096,8 +3044,6 @@ OUString HtmlExport::InsertSound( const OUString& rSoundFile ) return aStr; } - - bool HtmlExport::CopyFile( const OUString& rSourceFile, const OUString& rDestFile ) { meEC.SetContext( STR_HTMLEXP_ERROR_COPY_FILE, rSourceFile, rDestFile ); @@ -3114,8 +3060,6 @@ bool HtmlExport::CopyFile( const OUString& rSourceFile, const OUString& rDestFil } } - - bool HtmlExport::checkFileExists( Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& xFileAccess, OUString const & aFileName ) { try @@ -3133,8 +3077,6 @@ bool HtmlExport::checkFileExists( Reference< ::com::sun::star::ucb::XSimpleFileA return false; } - - bool HtmlExport::checkForExistingFiles() { bool bFound = false; @@ -3201,7 +3143,6 @@ OUString HtmlExport::GetButtonName( int nButton ) const return OUString::createFromAscii(pButtonNames[nButton]); } - EasyFile::EasyFile() { pMedium = NULL; @@ -3209,14 +3150,12 @@ EasyFile::EasyFile() bOpen = false; } - EasyFile::~EasyFile() { if( bOpen ) close(); } - sal_uLong EasyFile::createStream( const OUString& rUrl, SvStream* &rpStr ) { sal_uLong nErr = 0; @@ -3256,7 +3195,6 @@ sal_uLong EasyFile::createStream( const OUString& rUrl, SvStream* &rpStr ) return nErr; } - sal_uLong EasyFile::createFileName( const OUString& rURL, OUString& rFileName ) { sal_uLong nErr = 0; @@ -3281,7 +3219,6 @@ sal_uLong EasyFile::createFileName( const OUString& rURL, OUString& rFileName ) return nErr; } - sal_uLong EasyFile::close() { sal_uLong nErr = 0; @@ -3306,7 +3243,6 @@ sal_uLong EasyFile::close() return nErr; } - // This class helps reporting errors during file i/o HtmlErrorContext::HtmlErrorContext(Window *_pWin) : ErrorContext(_pWin) @@ -3314,8 +3250,6 @@ HtmlErrorContext::HtmlErrorContext(Window *_pWin) mnResId = 0; } - - bool HtmlErrorContext::GetString( sal_uLong, OUString& rCtxStr ) { DBG_ASSERT( mnResId != 0, "No error context set" ); @@ -3330,8 +3264,6 @@ bool HtmlErrorContext::GetString( sal_uLong, OUString& rCtxStr ) return true; } - - void HtmlErrorContext::SetContext( sal_uInt16 nResId, const OUString& rURL ) { mnResId = nResId; @@ -3339,8 +3271,6 @@ void HtmlErrorContext::SetContext( sal_uInt16 nResId, const OUString& rURL ) maURL2 = ""; } - - void HtmlErrorContext::SetContext( sal_uInt16 nResId, const OUString& rURL1, const OUString& rURL2 ) { mnResId = nResId; diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index f1c758c4a7e5..5506dd4759f4 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -56,7 +56,6 @@ using namespace std; using namespace com::sun::star::uno; using namespace com::sun::star::beans; - #define NOOFPAGES 6 //ID for the config-data with the HTML-settings @@ -676,7 +675,6 @@ void SdPublishingDlg::GetParameterSequence( Sequence< PropertyValue >& rParams ) PropertyValue aValue; - // Page 2 aValue.Name = "PublishMode"; @@ -727,7 +725,6 @@ void SdPublishingDlg::GetParameterSequence( Sequence< PropertyValue >& rParams ) aValue.Value <<= OUString( pPage2_Index->GetText() ); aProps.push_back( aValue ); - if( pPage2_Kiosk->IsChecked() && pPage2_ChgAuto->IsChecked() ) { aValue.Name = "KioskSlideDuration"; @@ -1430,7 +1427,6 @@ void SdPublishingDlg::GetDesign( SdPublishingDesign* pDesign ) pDesign->m_aALinkColor = m_aALinkColor; pDesign->m_bUseColor = pPage6_DocColors->IsChecked(); - pDesign->m_eScript = pPage2_ASP->IsChecked()?SCRIPT_ASP:SCRIPT_PERL; pDesign->m_aCGI = pPage2_CGI->GetText(); pDesign->m_aURL = pPage2_URL->GetText(); @@ -1559,6 +1555,4 @@ IMPL_LINK_NOARG(SdDesignNameDlg, ModifyHdl) return 0; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/filter/html/sdhtmlfilter.cxx b/sd/source/filter/html/sdhtmlfilter.cxx index 6d45d9c0197e..f4f6e0cb28ed 100644 --- a/sd/source/filter/html/sdhtmlfilter.cxx +++ b/sd/source/filter/html/sdhtmlfilter.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <unotools/localfilehelper.hxx> #include <tools/errinf.hxx> #include <vcl/msgbox.hxx> @@ -39,23 +38,17 @@ #include "htmlex.hxx" #include "sdhtmlfilter.hxx" - // - SdPPTFilter - - SdHTMLFilter::SdHTMLFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, bool bShowProgress ) : SdFilter( rMedium, rDocShell, bShowProgress ) { } - - SdHTMLFilter::~SdHTMLFilter() { } - - bool SdHTMLFilter::Export() { mrMedium.Close(); diff --git a/sd/source/filter/ppt/ppt97animations.cxx b/sd/source/filter/ppt/ppt97animations.cxx index 9bf6662c6d0d..f8b92a95068e 100644 --- a/sd/source/filter/ppt/ppt97animations.cxx +++ b/sd/source/filter/ppt/ppt97animations.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ppt97animations.hxx" #include <svx/svdobj.hxx> @@ -33,8 +32,6 @@ using namespace ::com::sun::star; - - void Ppt97AnimationInfoAtom::ReadStream( SvStream& rIn ) { rIn.ReadUInt32( nDimColor ); @@ -53,8 +50,6 @@ void Ppt97AnimationInfoAtom::ReadStream( SvStream& rIn ) rIn.ReadUChar( nUnknown2 ); } - - #define MEMBER_CONSTRUCTOR_LIST() \ m_aAtom() \ , m_aSoundFileUrl() \ @@ -187,7 +182,6 @@ bool Ppt97Animation::GetSpecialTextIterationDelay( double& rfTextIterationDelay return bRet; } - void Ppt97Animation::SetDimColor( sal_Int32 nDimColor ) { m_aAtom.nDimColor = nDimColor; diff --git a/sd/source/filter/ppt/pptanimations.hxx b/sd/source/filter/ppt/pptanimations.hxx index 8a6d0440d008..ba450518a5c1 100644 --- a/sd/source/filter/ppt/pptanimations.hxx +++ b/sd/source/filter/ppt/pptanimations.hxx @@ -166,7 +166,6 @@ public: ::com::sun::star::uno::Any getProperty( sal_Int32 nProperty ) const; }; - enum MS_AttributeNames { MS_PPT_X, MS_PPT_Y, MS_PPT_W, MS_PPT_H, MS_PPT_C, MS_R, MS_XSHEAR, MS_FILLCOLOR, MS_FILLTYPE, @@ -474,9 +473,6 @@ static const preset_maping gPresetMaping[] = { ::com::sun::star::presentation::EffectPresetClass::EXIT, 56 ,"ooo-exit-flip" }, { ::com::sun::star::presentation::EffectPresetClass::EXIT, 58 ,"ooo-exit-fold" }, - - - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 16 ,"ooo-motionpath-4-point-star" }, { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 5 ,"ooo-motionpath-5-point-star" }, { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 11 ,"ooo-motionpath-6-point-star" }, @@ -542,7 +538,6 @@ static const preset_maping gPresetMaping[] = { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 39 ,"ooo-motionpath-s-curve-2" }, { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 45 ,"ooo-motionpath-heartbeat" }, - { 0,0,0 } }; diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 862c6bbb01f6..82303cf9cded 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <editeng/numitem.hxx> #include <unotools/ucbstreamhelper.hxx> @@ -221,16 +220,12 @@ ImplSdPPTImport::ImplSdPPTImport( SdDrawDocument* pDocument, SvStorage& rStorage } } - - // Dtor ImplSdPPTImport::~ImplSdPPTImport() { delete pStData; } - - // Import bool ImplSdPPTImport::Import() { @@ -541,7 +536,6 @@ bool ImplSdPPTImport::Import() Scale( aVisAreaSize ); pDocShell->SetVisArea( Rectangle( Point(), aVisAreaSize ) ); - // create master pages: SfxProgress* pStbMgr = new SfxProgress( pDocShell, SD_RESSTR( STR_POWERPOINT_IMPORT ), @@ -600,7 +594,6 @@ bool ImplSdPPTImport::Import() aPortion.ApplyTo( rItemSet, (SdrPowerPointImport&)*this, 0xffffffff ); } - // create layoutstylesheets, set layoutname and stylesheet // (only on standard and not pages) @@ -621,7 +614,6 @@ bool ImplSdPPTImport::Import() aLayoutName += SD_RESSTR( STR_LAYOUT_OUTLINE ); pPage->SetLayoutName( aLayoutName ); - // set stylesheets if ( pPage->GetPageKind() == PK_STANDARD ) { @@ -826,7 +818,6 @@ bool ImplSdPPTImport::Import() rStCtrl.Seek( nFPosMerk ); ImportPageEffect( (SdPage*)pMPage, bNewAnimationsUsed ); - // background object pObj = pMPage->GetObj( 0 ); if ( pObj && pObj->GetObjIdentifier() == OBJ_RECT ) @@ -1446,8 +1437,6 @@ void ImplSdPPTImport::SetHeaderFooterPageSettings( SdPage* pPage, const PptSlide } } - - // Import of pages struct Ppt97AnimationStlSortHelper { @@ -1836,8 +1825,6 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const bool bNewAnimations rStCtrl.Seek( nFilePosMerk ); } - - // import of sounds // Not only the sounds are imported as string, they are also inserted to @@ -2011,8 +1998,6 @@ OUString ImplSdPPTImport::ReadMedia( sal_uInt32 nMediaRef ) const return aRetVal; } - - // import of objects void ImplSdPPTImport::FillSdAnimationInfo( SdAnimationInfo* pInfo, PptInteractiveInfoAtom* pIAtom, const OUString& aMacroName ) { @@ -2676,7 +2661,6 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi return pObj; } - bool ImplSdPPTImport::ReadFormControl( SotStorageRef& rSrc1, com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > & rFormComp ) const { @@ -2690,7 +2674,6 @@ 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 2529ffed9cb6..1cc544079ec7 100644 --- a/sd/source/filter/ppt/pptinanimations.cxx +++ b/sd/source/filter/ppt/pptinanimations.cxx @@ -96,12 +96,6 @@ const transition* transition::find( const OUString& rName ) return NULL; } - - - - - - SvStream& operator>>(SvStream& rIn, AnimationNode& rNode ) { rIn.ReadInt32( rNode.mnU1 ); @@ -116,8 +110,6 @@ SvStream& operator>>(SvStream& rIn, AnimationNode& rNode ) return rIn; } - - static bool convertMeasure( OUString& rString ) { bool bRet = false; @@ -153,16 +145,11 @@ static bool convertMeasure( OUString& rString ) return bRet; } - - - bool PropertySet::hasProperty( sal_Int32 nProperty ) const { return maProperties.find( nProperty ) != maProperties.end(); } - - Any PropertySet::getProperty( sal_Int32 nProperty ) const { PropertySetMap_t::const_iterator aIter( maProperties.find( nProperty ) ); @@ -172,8 +159,6 @@ Any PropertySet::getProperty( sal_Int32 nProperty ) const return Any(); } - - /** this adds an any to another any. if rNewValue is empty, rOldValue is returned. if rOldValue is empty, rNewValue is returned. @@ -209,15 +194,11 @@ static Any addToSequence( const Any& rOldValue, const Any& rNewValue ) } } - - AnimationImporter::AnimationImporter( ImplSdPPTImport* pPPTImport, SvStream& rStCtrl ) : mpPPTImport( pPPTImport ), mrStCtrl( rStCtrl ) { } - - int AnimationImporter::import( const Reference< XDrawPage >& xPage, const DffRecordHeader& rProgTagContentHd ) { int nNodes = 0; @@ -256,15 +237,11 @@ 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 ) { const char* pServiceName = NULL; @@ -328,8 +305,6 @@ Reference< XAnimationNode > AnimationImporter::createNode( const Atom* pAtom, co return xNode; } - - static bool is_random( const AnimationNode& rNode, const PropertySet& rSet, sal_Int32& rPresetClass ) { if( rNode.mnGroupType != mso_Anim_GroupType_PAR ) @@ -354,7 +329,6 @@ static bool is_random( const AnimationNode& rNode, const PropertySet& rSet, sal_ return false; } - int AnimationImporter::importAnimationContainer( const Atom* pAtom, const Reference< XAnimationNode >& xParent ) { int nNodes = 0; @@ -569,7 +543,6 @@ 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 @@ -634,8 +607,6 @@ void AnimationImporter::fixMainSequenceTiming( const ::com::sun::star::uno::Refe } } - - void AnimationImporter::fixInteractiveSequenceTiming( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ) { try @@ -659,8 +630,6 @@ void AnimationImporter::fixInteractiveSequenceTiming( const ::com::sun::star::un } } - - bool AnimationImporter::convertAnimationNode( const Reference< XAnimationNode >& xNode, const Reference< XAnimationNode >& xParent ) { Reference< XAnimate > xAnimate( xNode, UNO_QUERY ); @@ -1039,8 +1008,6 @@ bool AnimationImporter::convertAnimationValue( MS_AttributeNames eAttribute, Any return bRet; } - - static OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId, sal_Int32 nPresetSubType ) { const sal_Char* pStr = 0; @@ -1100,8 +1067,6 @@ 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 ) { bool bAfterEffect = false; @@ -1361,7 +1326,6 @@ void AnimationImporter::fillNode( Reference< XAnimationNode >& xNode, const Anim } } - // TODO: DFF_ANIM_ENDAFTERSLIDE / DFF_ANIM_VOLUME handling. git history has sample code Reference< XAnimateColor > xColor( xNode, UNO_QUERY ); if( xColor.is() ) @@ -1382,8 +1346,6 @@ void AnimationImporter::fillNode( Reference< XAnimationNode >& xNode, const Anim } } - - int AnimationImporter::importTimeContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode ) { int nNodes = 0; @@ -1494,8 +1456,6 @@ int AnimationImporter::importTimeContainer( const Atom* pAtom, const Reference< return nNodes; } - - int AnimationImporter::importAnimationNodeContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode ) { int nNodes = 0; @@ -1570,8 +1530,6 @@ int AnimationImporter::importAnimationNodeContainer( const Atom* pAtom, const Re return nNodes; } - - void AnimationImporter::importAnimateFilterContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode ) { Reference< XTransitionFilter > xFilter( xNode, UNO_QUERY ); @@ -1649,8 +1607,6 @@ void AnimationImporter::importAnimateFilterContainer( const Atom* pAtom, const R } } - - void AnimationImporter::importAnimateAttributeTargetContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode ) { DBG_ASSERT( pAtom && pAtom->getType() == DFF_msofbtAnimateTarget, "invalid call to ppt::AnimationImporter::importAnimateAttributeTargetContainer()!"); @@ -1794,8 +1750,6 @@ void AnimationImporter::importAnimateAttributeTargetContainer( const Atom* pAtom } } - - sal_Int16 AnimationImporter::implGetColorSpace( sal_Int32 nMode, sal_Int32 /*nA*/, sal_Int32 /*nB*/, sal_Int32 /*nC*/ ) { switch( nMode ) @@ -1812,8 +1766,6 @@ 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 ) { switch( nMode ) @@ -1933,8 +1885,6 @@ void AnimationImporter::importAnimateColorContainer( const Atom* pAtom, const Re } } - - void AnimationImporter::importAnimateSetContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode ) { Reference< XAnimateSet > xSet( xNode, UNO_QUERY ); @@ -1992,8 +1942,6 @@ void AnimationImporter::importAnimateSetContainer( const Atom* pAtom, const Refe } } - - void AnimationImporter::importAnimateContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode ) { Reference< XAnimate > xAnim( xNode, UNO_QUERY ); @@ -2071,8 +2019,6 @@ void AnimationImporter::importAnimateContainer( const Atom* pAtom, const Referen } } - - void AnimationImporter::importAnimateMotionContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode ) { Reference< XAnimateMotion > xMotion( xNode, UNO_QUERY ); @@ -2153,8 +2099,6 @@ void AnimationImporter::importAnimateMotionContainer( const Atom* pAtom, const R } } - - void AnimationImporter::importCommandContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode ) { Reference< XCommand > xCommand( xNode, UNO_QUERY ); @@ -2272,8 +2216,6 @@ void AnimationImporter::importCommandContainer( const Atom* pAtom, const Referen } } - - int AnimationImporter::importAudioContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode ) { int nNodes = 0; @@ -2351,8 +2293,6 @@ int AnimationImporter::importAudioContainer( const Atom* pAtom, const Reference< return nNodes; } - - void AnimationImporter::importAnimateScaleContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode ) { Reference< XAnimateTransform > xTransform( xNode, UNO_QUERY ); @@ -2421,7 +2361,6 @@ void AnimationImporter::importAnimateScaleContainer( const Atom* pAtom, const Re } } - #ifdef DBG_ANIM_LOG if( nBits & 1 ) fprintf( mpFile, " by=\"%g,%g\"", (double)fByX, (double)fByY ); @@ -2452,8 +2391,6 @@ void AnimationImporter::importAnimateScaleContainer( const Atom* pAtom, const Re } } - - void AnimationImporter::importAnimateRotationContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode ) { Reference< XAnimateTransform > xTransform( xNode, UNO_QUERY ); @@ -2522,7 +2459,6 @@ void AnimationImporter::importAnimateRotationContainer( const Atom* pAtom, const } } - bool AnimationImporter::importAttributeNamesContainer( const Atom* pAtom, OUString& rAttributeNames ) { OUStringBuffer aNames; @@ -2559,8 +2495,6 @@ bool AnimationImporter::importAttributeNamesContainer( const Atom* pAtom, OUStri return true; } - - void AnimationImporter::importAnimationValues( const Atom* pAtom, const Reference< XAnimationNode >& xNode ) { DBG_ASSERT( pAtom, "invalid call to ppt::AnimationImporter::importAnimationValues()!" ); @@ -2637,8 +2571,6 @@ void AnimationImporter::importAnimationValues( const Atom* pAtom, const Referenc } } - - void AnimationImporter::importAnimateKeyPoints( const Atom* pAtom, const Reference< XAnimationNode >& xNode ) { Reference< XAnimate > xAnim( xNode, UNO_QUERY ); @@ -2771,8 +2703,6 @@ void AnimationImporter::importAnimateKeyPoints( const Atom* pAtom, const Referen } } - - bool AnimationImporter::importAttributeValue( const Atom* pAtom, Any& rAny ) { DBG_ASSERT( pAtom && pAtom->getType() == DFF_msofbtAnimAttributeValue, "invalid call to ppt::AnimationImporter::importAttributeValue()!" ); @@ -2846,8 +2776,6 @@ bool AnimationImporter::importAttributeValue( const Atom* pAtom, Any& rAny ) return bOk; } - - void AnimationImporter::importAnimationEvents( const Atom* pAtom, const Reference< XAnimationNode >& xNode ) { DBG_ASSERT( xNode.is() && pAtom, "invalid call to ppt::AnimationImporter::importAnimationEvents()!" ); @@ -2964,8 +2892,6 @@ void AnimationImporter::importAnimationEvents( const Atom* pAtom, const Referenc #endif } - - void AnimationImporter::importAnimationActions( const Atom* pAtom, const Reference< XAnimationNode >& xNode ) { DBG_ASSERT( pAtom && xNode.is(), "invalid call to ppt::AnimationImporter::importAnimationActions()!"); @@ -3003,8 +2929,6 @@ void AnimationImporter::importAnimationActions( const Atom* pAtom, const Referen } } - - sal_Int32 AnimationImporter::importTargetElementContainer( const Atom* pAtom, Any& rTarget, sal_Int16& rSubType ) { rSubType = ShapeAnimationSubType::AS_WHOLE; @@ -3126,8 +3050,6 @@ sal_Int32 AnimationImporter::importTargetElementContainer( const Atom* pAtom, An return nRefMode; } - - void AnimationImporter::importPropertySetContainer( const Atom* pAtom, PropertySet& rSet ) { DBG_ASSERT( pAtom && (pAtom->getType() == DFF_msofbtAnimPropertySet), "invalid call to ppt::AnimationImporter::importPropertySetContainer()!" ); @@ -3153,8 +3075,6 @@ void AnimationImporter::importPropertySetContainer( const Atom* pAtom, PropertyS } } - - #ifdef DBG_ANIM_LOG void AnimationImporter::dump_atom_header( const Atom* pAtom, bool bOpen, bool bAppend ) { @@ -3215,8 +3135,6 @@ void AnimationImporter::dump_atom_header( const Atom* pAtom, bool bOpen, bool bA } } - - void AnimationImporter::dump( sal_uInt32 nLen, bool bNewLine ) { char * faul = "0123456789abcdef"; @@ -3242,8 +3160,6 @@ void AnimationImporter::dump( sal_uInt32 nLen, bool bNewLine ) fprintf(mpFile,"\n"); } - - void AnimationImporter::dump_atom( const Atom* pAtom, bool bNewLine ) { if( pAtom ) @@ -3308,8 +3224,6 @@ 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 ) { fprintf( mpFile, bOpen ? "<" : "</" ); @@ -3718,7 +3632,6 @@ void AnimationImporter::dump( const PropertySet& rSet ) } - if( !bKnown ) { fprintf( mpFile, " unknown_%lu=\"", nInstance ); diff --git a/sd/source/filter/ppt/propread.cxx b/sd/source/filter/ppt/propread.cxx index 3972efba8cb1..00c62388a5e3 100644 --- a/sd/source/filter/ppt/propread.cxx +++ b/sd/source/filter/ppt/propread.cxx @@ -53,16 +53,12 @@ PropEntry& PropEntry::operator=(const PropEntry& rPropEntry) return *this; } - - void PropItem::Clear() { Seek( STREAM_SEEK_TO_BEGIN ); delete[] (sal_uInt8*)SwitchBuffer(); } - - static sal_Int32 lcl_getMaxSafeStrLen(sal_uInt32 nSize) { nSize -= 1; //Drop NULL terminator @@ -173,8 +169,6 @@ bool PropItem::Read( OUString& rString, sal_uInt32 nStringType, bool bAlign ) return bRetValue; } - - PropItem& PropItem::operator=( PropItem& rPropItem ) { if ( this != &rPropItem ) @@ -191,8 +185,6 @@ PropItem& PropItem::operator=( PropItem& rPropItem ) return *this; } - - Section::Section( const Section& rSection ) : mnTextEnc(rSection.mnTextEnc), maEntries(rSection.maEntries.clone()) @@ -201,8 +193,6 @@ Section::Section( const Section& rSection ) aFMTID[ i ] = rSection.aFMTID[ i ]; } - - Section::Section( const sal_uInt8* pFMTID ) { mnTextEnc = RTL_TEXTENCODING_MS_1252; @@ -210,8 +200,6 @@ Section::Section( const sal_uInt8* pFMTID ) aFMTID[ i ] = pFMTID[ i ]; } - - bool Section::GetProperty( sal_uInt32 nId, PropItem& rPropItem ) { if ( nId ) @@ -235,8 +223,6 @@ bool Section::GetProperty( sal_uInt32 nId, PropItem& rPropItem ) return false; } - - void Section::AddProperty( sal_uInt32 nId, const sal_uInt8* pBuf, sal_uInt32 nBufSize ) { // just a simple id check @@ -262,8 +248,6 @@ void Section::AddProperty( sal_uInt32 nId, const sal_uInt8* pBuf, sal_uInt32 nBu maEntries.push_back( new PropEntry( nId, pBuf, nBufSize, mnTextEnc ) ); } - - bool Section::GetDictionary( Dictionary& rDict ) { bool bRetValue = false; @@ -319,8 +303,6 @@ bool Section::GetDictionary( Dictionary& rDict ) return bRetValue; } - - void Section::Read( SvStorageStream *pStrm ) { sal_uInt32 i, nSecOfs, nSecSize, nPropCount, nPropId, nPropOfs, nPropType, nPropSize, nCurrent, nVectorCount, nTemp, nStrmSize; @@ -353,7 +335,6 @@ void Section::Read( SvStorageStream *pStrm ) else nVectorCount = 1; - bool bVariant = ( nPropType == VT_VARIANT ); for ( i = 0; nPropSize && ( i < nVectorCount ); i++ ) @@ -507,8 +488,6 @@ void Section::Read( SvStorageStream *pStrm ) pStrm->Seek( nSecOfs + nSecSize ); } - - Section& Section::operator=( const Section& rSection ) { if ( this != &rSection ) @@ -520,8 +499,6 @@ Section& Section::operator=( const Section& rSection ) return *this; } - - PropRead::PropRead( SvStorage& rStorage, const OUString& rName ) : mbStatus ( false ), mnByteOrder ( 0xfffe ), @@ -541,15 +518,11 @@ PropRead::PropRead( SvStorage& rStorage, const OUString& rName ) : } } - - void PropRead::AddSection( Section& rSection ) { maSections.push_back( new Section( rSection ) ); } - - const Section* PropRead::GetSection( const sal_uInt8* pFMTID ) { boost::ptr_vector<Section>::iterator it; @@ -561,8 +534,6 @@ const Section* PropRead::GetSection( const sal_uInt8* pFMTID ) return NULL; } - - void PropRead::Read() { maSections.clear(); @@ -598,8 +569,6 @@ void PropRead::Read() } } - - PropRead& PropRead::operator=( const PropRead& rPropRead ) { if ( this != &rPropRead ) diff --git a/sd/source/filter/sdfilter.cxx b/sd/source/filter/sdfilter.cxx index b0289f2f3eb0..343edb5a3139 100644 --- a/sd/source/filter/sdfilter.cxx +++ b/sd/source/filter/sdfilter.cxx @@ -35,18 +35,14 @@ #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, bool bShowProgress ) : mxModel( rDocShell.GetModel() ) , mrMedium( rMedium ) @@ -57,22 +53,16 @@ SdFilter::SdFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, bool bSho { } - - SdFilter::~SdFilter() { } - - OUString SdFilter::ImplGetFullLibraryName( const OUString& rLibraryName ) const { OUString aTemp(SVLIBRARY("?")); return aTemp.replaceFirst( "?", rLibraryName ); } - - #ifndef DISABLE_DYNLOADING extern "C" { static void SAL_CALL thisModule() {} } @@ -86,8 +76,6 @@ extern "C" { static void SAL_CALL thisModule() {} } #endif - - void SdFilter::CreateStatusIndicator() { // The status indicator must be retrieved from the provided medium arguments diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx index 52c8f7f6fdb4..40f55e74996a 100644 --- a/sd/source/filter/sdpptwrp.cxx +++ b/sd/source/filter/sdpptwrp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> #include <osl/module.hxx> @@ -31,10 +30,8 @@ #include "drawdoc.hxx" #include <tools/urlobj.hxx> - // - Namespaces - - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::task; @@ -62,25 +59,19 @@ extern "C" sal_Bool SaveVBA( SfxObjectShell&, SvMemoryStream*& ); #endif - // - SdPPTFilter - - SdPPTFilter::SdPPTFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, bool bShowProgress ) : SdFilter( rMedium, rDocShell, bShowProgress ), pBas ( NULL ) { } - - SdPPTFilter::~SdPPTFilter() { delete pBas; // deleting the compressed basic storage } - - bool SdPPTFilter::Import() { bool bRet = false; @@ -131,8 +122,6 @@ bool SdPPTFilter::Import() return bRet; } - - bool SdPPTFilter::Export() { #ifndef DISABLE_DYNLOADING diff --git a/sd/source/filter/xml/sdtransform.cxx b/sd/source/filter/xml/sdtransform.cxx index 7d9bf6891976..136655762df8 100644 --- a/sd/source/filter/xml/sdtransform.cxx +++ b/sd/source/filter/xml/sdtransform.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <svl/style.hxx> #include <svl/itemset.hxx> #include <svl/itempool.hxx> diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index 411e7b15ce54..dd6d8cd47acb 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -163,11 +163,8 @@ XML_SERVICES* getServices( bool bImport, bool bDraw, sal_uLong nStoreVer ) return &gServices[ (bImport ? 2 : 0) + ((nStoreVer == SOFFICE_FILEFORMAT_60) ? 4 : 0) + (bDraw ? 1 : 0 ) ]; } - - // - SdXMLWrapper - - SdXMLFilter::SdXMLFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, bool bShowProgress, SdXMLFilterMode eFilterMode, sal_uLong nStoreVer ) : SdFilter( rMedium, rDocShell, bShowProgress ), meFilterMode( eFilterMode ), mnStoreVer( nStoreVer ) { @@ -413,8 +410,6 @@ sal_Int32 ReadThroughComponent( return SD_XML_READERROR; } - - bool SdXMLFilter::Import( ErrCode& nError ) { sal_uInt32 nRet = 0; @@ -423,20 +418,14 @@ bool SdXMLFilter::Import( ErrCode& nError ) Reference< uno::XComponentContext > rxContext = comphelper::getProcessComponentContext(); - - SdDrawDocument* pDoc = mrDocShell.GetDoc(); pDoc->EnableUndo(false); pDoc->NewOrLoadCompleted( NEW_DOC ); pDoc->CreateFirstPages(); pDoc->StopWorkStartupDelay(); - - mxModel->lockControllers(); - - /** property map for import info set */ PropertyMapEntry const aImportInfoMap[] = { @@ -489,8 +478,6 @@ bool SdXMLFilter::Import( ErrCode& nError ) } } - - Reference< io::XActiveDataSource > xSource; Reference< XInterface > xPipe; Reference< document::XGraphicObjectResolver > xGraphicResolver; @@ -500,8 +487,6 @@ bool SdXMLFilter::Import( ErrCode& nError ) Reference< lang::XComponent > xModelComp( mxModel, uno::UNO_QUERY ); - - // try to get an XStatusIndicator from the Medium if( mbShowProgress ) { @@ -535,10 +520,8 @@ bool SdXMLFilter::Import( ErrCode& nError ) } } - // get the input stream (storage or stream) - SvStorageStreamRef xDocStream; Reference<io::XInputStream> xInputStream; uno::Reference < embed::XStorage > xStorage = mrMedium.GetStorage(); @@ -585,8 +568,6 @@ bool SdXMLFilter::Import( ErrCode& nError ) if (SDXMLMODE_Organizer == meFilterMode) xInfoSet->setPropertyValue("OrganizerMode", uno::makeAny(sal_True)); - - if( 0 == nRet ) { @@ -644,7 +625,6 @@ bool SdXMLFilter::Import( ErrCode& nError ) } } - if( pGraphicHelper ) SvXMLGraphicHelper::Destroy( pGraphicHelper ); xGraphicResolver = 0; @@ -681,7 +661,6 @@ bool SdXMLFilter::Import( ErrCode& nError ) } } - // clear unused named items from item pool uno::Reference< lang::XMultiServiceFactory> xModelFactory( mxModel, uno::UNO_QUERY ); @@ -784,8 +763,6 @@ bool SdXMLFilter::Import( ErrCode& nError ) return nRet == 0; } - - bool SdXMLFilter::Export() { SvXMLEmbeddedObjectHelper* pObjectHelper = NULL; @@ -847,7 +824,6 @@ bool SdXMLFilter::Export() uno::Reference< beans::XPropertySet > xInfoSet( GenericPropertySet_CreateInstance( new PropertySetInfo( aExportInfoMap ) ) ); - SvtSaveOptions aSaveOpt; OUString sUsePrettyPrinting("UsePrettyPrinting"); bool bUsePrettyPrinting( aSaveOpt.IsPrettyPrinting() ); diff --git a/sd/source/helper/simplereferencecomponent.cxx b/sd/source/helper/simplereferencecomponent.cxx index d48c62738d80..4cf2ffcab08b 100644 --- a/sd/source/helper/simplereferencecomponent.cxx +++ b/sd/source/helper/simplereferencecomponent.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "helper/simplereferencecomponent.hxx" #include "com/sun/star/uno/RuntimeException.hpp" diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx index 374cb96a1fd9..d5a7211198e9 100644 --- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx +++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx @@ -89,18 +89,12 @@ AccessibleDocumentViewBase::AccessibleDocumentViewBase ( mpViewShell = pViewShell; } - - - AccessibleDocumentViewBase::~AccessibleDocumentViewBase (void) { // At this place we should be disposed. You may want to add a // corresponding assertion into the destructor of a derived class. } - - - void AccessibleDocumentViewBase::Init (void) { // Finish the initialization of the shape tree info container. @@ -163,9 +157,6 @@ void AccessibleDocumentViewBase::Init (void) SetState(AccessibleStateType::EDITABLE); } - - - IMPL_LINK(AccessibleDocumentViewBase, WindowChildEventListener, VclSimpleEvent*, pEvent) { @@ -225,9 +216,6 @@ IMPL_LINK(AccessibleDocumentViewBase, WindowChildEventListener, return 0; } - - - //===== IAccessibleViewForwarderListener ==================================== void AccessibleDocumentViewBase::ViewForwarderChanged(ChangeType, const IAccessibleViewForwarder* ) @@ -235,9 +223,6 @@ void AccessibleDocumentViewBase::ViewForwarderChanged(ChangeType, const IAccessi // Empty } - - - //===== XAccessibleContext ================================================== Reference<XAccessible> SAL_CALL @@ -249,8 +234,6 @@ Reference<XAccessible> SAL_CALL return AccessibleContextBase::getAccessibleParent(); } - - sal_Int32 SAL_CALL AccessibleDocumentViewBase::getAccessibleChildCount (void) throw (uno::RuntimeException, std::exception) @@ -263,9 +246,6 @@ sal_Int32 SAL_CALL return 0; } - - - Reference<XAccessible> SAL_CALL AccessibleDocumentViewBase::getAccessibleChild (sal_Int32 nIndex) throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception) @@ -280,9 +260,6 @@ Reference<XAccessible> SAL_CALL throw lang::IndexOutOfBoundsException ( "no child with index " + OUString::number(nIndex) ); } - - - //===== XAccessibleComponent ================================================ /** Iterate over all children and test whether the specified point lies @@ -327,9 +304,6 @@ uno::Reference<XAccessible > SAL_CALL return xChildAtPosition; } - - - awt::Rectangle SAL_CALL AccessibleDocumentViewBase::getBounds (void) throw (::com::sun::star::uno::RuntimeException, std::exception) @@ -366,9 +340,6 @@ awt::Rectangle SAL_CALL aPixelSize.Y()); } - - - awt::Point SAL_CALL AccessibleDocumentViewBase::getLocation (void) throw (uno::RuntimeException, std::exception) @@ -378,9 +349,6 @@ awt::Point SAL_CALL return awt::Point (aBoundingBox.X, aBoundingBox.Y); } - - - awt::Point SAL_CALL AccessibleDocumentViewBase::getLocationOnScreen (void) throw (uno::RuntimeException, std::exception) @@ -391,9 +359,6 @@ awt::Point SAL_CALL return awt::Point (aPixelPoint.X(), aPixelPoint.Y()); } - - - awt::Size SAL_CALL AccessibleDocumentViewBase::getSize (void) throw (uno::RuntimeException, std::exception) @@ -414,9 +379,6 @@ awt::Size SAL_CALL return awt::Size (aPixelSize.X(), aPixelSize.Y()); } - - - //===== XInterface ========================================================== uno::Any SAL_CALL @@ -439,9 +401,6 @@ uno::Any SAL_CALL return aReturn; } - - - void SAL_CALL AccessibleDocumentViewBase::acquire (void) throw () @@ -449,9 +408,6 @@ void SAL_CALL AccessibleContextBase::acquire (); } - - - void SAL_CALL AccessibleDocumentViewBase::release (void) throw () @@ -459,9 +415,6 @@ void SAL_CALL AccessibleContextBase::release (); } - - - //===== XServiceInfo ======================================================== OUString SAL_CALL @@ -471,9 +424,6 @@ OUString SAL_CALL return OUString("AccessibleDocumentViewBase"); } - - - ::com::sun::star::uno::Sequence< OUString> SAL_CALL AccessibleDocumentViewBase::getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException, std::exception) @@ -482,10 +432,6 @@ OUString SAL_CALL return AccessibleContextBase::getSupportedServiceNames (); } - - - - //===== XTypeProvider ======================================================= ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL @@ -499,7 +445,6 @@ OUString SAL_CALL // ... get list of types from component base implementation, ... uno::Sequence<uno::Type> aComponentTypeList (AccessibleComponentBase::getTypes()); - // ...and add the additional type for the component, ... const uno::Type aLangEventListenerType = cppu::UnoType<lang::XEventListener>::get(); @@ -531,9 +476,6 @@ OUString SAL_CALL return aTypeList; } - - - void AccessibleDocumentViewBase::impl_dispose() { // Unregister from VCL Window. @@ -584,9 +526,6 @@ void AccessibleDocumentViewBase::impl_dispose() maShapeTreeInfo.SetDocumentWindow (NULL); } - - - //===== XEventListener ====================================================== void SAL_CALL @@ -616,9 +555,6 @@ void SAL_CALL AccessibleDocumentViewBase::propertyChange (const beans::PropertyC // Empty } - - - //===== XWindowListener ===================================================== void SAL_CALL @@ -633,9 +569,6 @@ void SAL_CALL &maViewForwarder); } - - - void SAL_CALL AccessibleDocumentViewBase::windowMoved (const ::com::sun::star::awt::WindowEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception) @@ -648,9 +581,6 @@ void SAL_CALL &maViewForwarder); } - - - void SAL_CALL AccessibleDocumentViewBase::windowShown (const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException, std::exception) @@ -663,9 +593,6 @@ void SAL_CALL &maViewForwarder); } - - - void SAL_CALL AccessibleDocumentViewBase::windowHidden (const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException, std::exception) @@ -678,9 +605,6 @@ void SAL_CALL &maViewForwarder); } - - - //===== XFocusListener ================================================== void AccessibleDocumentViewBase::focusGained (const ::com::sun::star::awt::FocusEvent& e) @@ -699,9 +623,6 @@ void AccessibleDocumentViewBase::focusLost (const ::com::sun::star::awt::FocusEv Deactivated (); } - - - //===== protected internal ================================================== // This method is called from the component helper base class while disposing. @@ -712,9 +633,6 @@ void SAL_CALL AccessibleDocumentViewBase::disposing (void) AccessibleContextBase::disposing (); } - - - /// Create a name for this view. OUString AccessibleDocumentViewBase::CreateAccessibleName (void) @@ -723,9 +641,6 @@ OUString return OUString ("AccessibleDocumentViewBase"); } - - - /** Create a description for this view. Use the model's description or URL if a description is not available. */ @@ -751,25 +666,16 @@ OUString return sDescription; } - - - void AccessibleDocumentViewBase::Activated (void) { // Empty. Overwrite to do something useful. } - - - void AccessibleDocumentViewBase::Deactivated (void) { // Empty. Overwrite to do something useful. } - - - void AccessibleDocumentViewBase::SetAccessibleOLEObject ( const Reference <XAccessible>& xOLEObject) { @@ -796,9 +702,6 @@ void AccessibleDocumentViewBase::SetAccessibleOLEObject ( uno::Any()); } - - - //===== methods from AccessibleSelectionBase ================================================== // return the member maMutex; diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx index 04087ea2811c..aa2a967a6fd6 100644 --- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx +++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx @@ -44,7 +44,6 @@ #include "Window.hxx" #include <vcl/svapp.hxx> - #include "ViewShell.hxx" #include "View.hxx" #include "DrawDocShell.hxx" @@ -64,7 +63,6 @@ using namespace ::com::sun::star::accessibility; namespace accessibility { - struct XShapePosCompareHelper { bool operator() ( const uno::Reference<drawing::XShape>& xshape1, @@ -94,9 +92,6 @@ AccessibleDrawDocumentView::AccessibleDrawDocumentView ( UpdateAccessibleName(); } - - - AccessibleDrawDocumentView::~AccessibleDrawDocumentView (void) { OSL_TRACE ("~AccessibleDrawDocumentView"); @@ -104,9 +99,6 @@ AccessibleDrawDocumentView::~AccessibleDrawDocumentView (void) "~AccessibleDrawDocumentView: object has not been disposed"); } - - - void AccessibleDrawDocumentView::Init (void) { AccessibleDocumentViewBase::Init (); @@ -133,9 +125,6 @@ void AccessibleDrawDocumentView::Init (void) } } - - - void AccessibleDrawDocumentView::ViewForwarderChanged (ChangeType aChangeType, const IAccessibleViewForwarder* pViewForwarder) { @@ -144,9 +133,6 @@ void AccessibleDrawDocumentView::ViewForwarderChanged (ChangeType aChangeType, mpChildrenManager->ViewForwarderChanged (aChangeType, pViewForwarder); } - - - /** The page shape is created on every call at the moment (provided that every thing goes well). */ @@ -200,9 +186,6 @@ rtl::Reference<AccessiblePageShape> AccessibleDrawDocumentView::CreateDrawPageSh return xShape; } - - - //===== XAccessibleContext ================================================== sal_Int32 SAL_CALL @@ -220,9 +203,6 @@ sal_Int32 SAL_CALL return mpChildCount; } - - - uno::Reference<XAccessible> SAL_CALL AccessibleDrawDocumentView::getAccessibleChild (sal_Int32 nIndex) throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception) @@ -311,9 +291,6 @@ void SAL_CALL } } - - - //===== XPropertyChangeListener ============================================= void SAL_CALL @@ -415,8 +392,6 @@ void SAL_CALL OSL_TRACE (" done"); } - - //===== XServiceInfo ======================================================== OUString SAL_CALL @@ -426,9 +401,6 @@ OUString SAL_CALL return OUString("AccessibleDrawDocumentView"); } - - - ::com::sun::star::uno::Sequence< OUString> SAL_CALL AccessibleDrawDocumentView::getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException, std::exception) @@ -632,9 +604,6 @@ OUString AccessibleDrawDocumentView::CreateAccessibleName (void) return sName; } - - - /** Create a description for this view. Use the model's description or URL if a description is not available. */ @@ -688,9 +657,6 @@ OUString return sDescription; } - - - /** Return selection state of specified child */ bool @@ -731,9 +697,6 @@ bool return( bRet ); } - - - /** Select or delselect the specified shapes. The corresponding accessible shapes are notified over the selection change listeners registered with the XSelectionSupplier of the controller. @@ -824,9 +787,6 @@ void } } - - - void AccessibleDrawDocumentView::Activated (void) { if (mpChildrenManager != NULL) @@ -848,9 +808,6 @@ void AccessibleDrawDocumentView::Activated (void) } } - - - void AccessibleDrawDocumentView::Deactivated (void) { if (mpChildrenManager != NULL) @@ -858,9 +815,6 @@ void AccessibleDrawDocumentView::Deactivated (void) ResetState (AccessibleStateType::FOCUSED); } - - - void AccessibleDrawDocumentView::impl_dispose (void) { if (mpChildrenManager != NULL) @@ -872,8 +826,6 @@ void AccessibleDrawDocumentView::impl_dispose (void) AccessibleDocumentViewBase::impl_dispose(); } - - /** This method is called from the component helper base class while disposing. */ diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx index 1ee2d591bc55..1104f9e2f0bf 100644 --- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx +++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx @@ -56,7 +56,6 @@ using namespace ::com::sun::star::accessibility; namespace accessibility { - //===== internal ============================================================ AccessibleOutlineView::AccessibleOutlineView ( @@ -93,13 +92,11 @@ AccessibleOutlineView::AccessibleOutlineView ( } } - AccessibleOutlineView::~AccessibleOutlineView (void) { OSL_TRACE ("~AccessibleOutlineView"); } - void AccessibleOutlineView::Init (void) { // Set event source _before_ starting to listen @@ -108,7 +105,6 @@ void AccessibleOutlineView::Init (void) AccessibleDocumentViewBase::Init (); } - void AccessibleOutlineView::ViewForwarderChanged (ChangeType aChangeType, const IAccessibleViewForwarder* pViewForwarder) { @@ -117,7 +113,6 @@ void AccessibleOutlineView::ViewForwarderChanged (ChangeType aChangeType, UpdateChildren(); } - //===== XAccessibleContext ================================================== sal_Int32 SAL_CALL @@ -130,7 +125,6 @@ sal_Int32 SAL_CALL return maTextHelper.GetChildCount(); } - uno::Reference<XAccessible> SAL_CALL AccessibleOutlineView::getAccessibleChild (sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, std::exception) @@ -197,7 +191,6 @@ OUString SAL_CALL return OUString("AccessibleOutlineView"); } - //===== XEventListener ====================================================== void SAL_CALL @@ -274,7 +267,6 @@ void SAL_CALL OSL_TRACE (" done"); } - /// Create a name for this view. OUString AccessibleOutlineView::CreateAccessibleName (void) @@ -285,7 +277,6 @@ OUString return SD_RESSTR(SID_SD_A11Y_I_OUTLINEVIEW_N); } - /** Create a description for this view. Use the model's description or URL if a description is not available. */ diff --git a/sd/source/ui/accessibility/AccessiblePageShape.cxx b/sd/source/ui/accessibility/AccessiblePageShape.cxx index 27555f1452a2..29ec73d5c085 100644 --- a/sd/source/ui/accessibility/AccessiblePageShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePageShape.cxx @@ -34,7 +34,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::accessibility; using ::com::sun::star::uno::Reference; - namespace accessibility { //===== internal ============================================================ @@ -51,25 +50,16 @@ AccessiblePageShape::AccessiblePageShape ( // has to be called from this constructor's caller. } - - - AccessiblePageShape::~AccessiblePageShape (void) { OSL_TRACE ("~AccessiblePageShape"); } - - - void AccessiblePageShape::Init (void) { AccessibleShape::Init (); } - - - //===== XAccessibleContext ================================================== sal_Int32 SAL_CALL @@ -79,9 +69,6 @@ sal_Int32 SAL_CALL return 0; } - - - /** Forward the request to the shape. Return the requested shape or throw an exception for a wrong index. */ @@ -93,9 +80,6 @@ uno::Reference<XAccessible> SAL_CALL static_cast<uno::XWeak*>(this)); } - - - //===== XAccessibleComponent ================================================ awt::Rectangle SAL_CALL AccessiblePageShape::getBounds (void) @@ -141,7 +125,6 @@ awt::Rectangle SAL_CALL AccessiblePageShape::getBounds (void) int x = aPixelPosition.getX() - aParentLocation.X; int y = aPixelPosition.getY() - aParentLocation.Y; - // Clip with parent (with coordinates relative to itself). ::Rectangle aBBox ( x, y, x + aPixelSize.getWidth(), y + aPixelSize.getHeight()); @@ -163,9 +146,6 @@ awt::Rectangle SAL_CALL AccessiblePageShape::getBounds (void) return aBoundingBox; } - - - sal_Int32 SAL_CALL AccessiblePageShape::getForeground (void) throw (::com::sun::star::uno::RuntimeException, std::exception) { @@ -189,9 +169,6 @@ sal_Int32 SAL_CALL AccessiblePageShape::getForeground (void) return nColor; } - - - /** Extract the background color from the Background property of eithe the draw page or its master page. */ @@ -242,9 +219,6 @@ sal_Int32 SAL_CALL AccessiblePageShape::getBackground (void) return nColor; } - - - //===== XServiceInfo ======================================================== OUString SAL_CALL @@ -255,9 +229,6 @@ OUString SAL_CALL return OUString("AccessiblePageShape"); } - - - ::com::sun::star::uno::Sequence< OUString> SAL_CALL AccessiblePageShape::getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException, std::exception) @@ -266,9 +237,6 @@ OUString SAL_CALL return AccessibleShape::getSupportedServiceNames(); } - - - //===== lang::XEventListener ================================================ void SAL_CALL @@ -279,9 +247,6 @@ void SAL_CALL AccessibleShape::disposing (aEvent); } - - - //===== XComponent ========================================================== void AccessiblePageShape::dispose (void) @@ -301,9 +266,6 @@ void AccessiblePageShape::dispose (void) AccessibleContextBase::dispose (); } - - - //===== protected internal ================================================== OUString @@ -313,9 +275,6 @@ OUString return OUString ("PageShape"); } - - - OUString AccessiblePageShape::CreateAccessibleName (void) throw (::com::sun::star::uno::RuntimeException) @@ -338,9 +297,6 @@ OUString return CreateAccessibleBaseName()+": "+sCurrentSlideName; } - - - OUString AccessiblePageShape::CreateAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException) @@ -348,8 +304,6 @@ OUString return OUString ("Page Shape"); } - } // end of namespace accessibility - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx index 385e102dbf30..e136c90d95a8 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx @@ -39,16 +39,10 @@ AccessiblePresentationGraphicShape::AccessiblePresentationGraphicShape ( { } - - - AccessiblePresentationGraphicShape::~AccessiblePresentationGraphicShape (void) { } - - - //===== XServiceInfo ======================================================== OUString SAL_CALL @@ -58,9 +52,6 @@ OUString SAL_CALL return OUString("AccessiblePresentationGraphicShape"); } - - - /// Set this object's name if is different to the current name. OUString AccessiblePresentationGraphicShape::CreateAccessibleBaseName (void) @@ -84,9 +75,6 @@ OUString return sName; } - - - OUString AccessiblePresentationGraphicShape::CreateAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException) diff --git a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx index 6c325abe5863..dbffb2c21b3d 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx @@ -41,16 +41,10 @@ AccessiblePresentationShape::AccessiblePresentationShape ( { } - - - AccessiblePresentationShape::~AccessiblePresentationShape (void) { } - - - //===== XServiceInfo ======================================================== OUString SAL_CALL @@ -60,9 +54,6 @@ OUString SAL_CALL return OUString("AccessiblePresentationShape"); } - - - /// Set this object's name if is different to the current name. OUString AccessiblePresentationShape::CreateAccessibleBaseName (void) throw (::com::sun::star::uno::RuntimeException) @@ -112,9 +103,6 @@ OUString AccessiblePresentationShape::CreateAccessibleBaseName (void) return sName; } - - - OUString AccessiblePresentationShape::CreateAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException) diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx index ef01a40afff0..b8e75ff2cc2a 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "AccessibleSlideSorterObject.hxx" #include "SlideSorter.hxx" @@ -46,10 +45,8 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::accessibility; - namespace accessibility { - AccessibleSlideSorterObject::AccessibleSlideSorterObject( const Reference<XAccessible>& rxParent, ::sd::slidesorter::SlideSorter& rSlideSorter, @@ -62,22 +59,12 @@ AccessibleSlideSorterObject::AccessibleSlideSorterObject( { } - - - AccessibleSlideSorterObject::~AccessibleSlideSorterObject (void) { if ( ! IsDisposed()) dispose(); } - - - - - - - void AccessibleSlideSorterObject::FireAccessibleEvent ( short nEventId, const uno::Any& rOldValue, @@ -96,9 +83,6 @@ void AccessibleSlideSorterObject::FireAccessibleEvent ( } } - - - void SAL_CALL AccessibleSlideSorterObject::disposing (void) { const SolarMutexGuard aSolarGuard; @@ -111,8 +95,6 @@ void SAL_CALL AccessibleSlideSorterObject::disposing (void) } } - - //===== XAccessible =========================================================== Reference<XAccessibleContext> SAL_CALL @@ -123,8 +105,6 @@ Reference<XAccessibleContext> SAL_CALL return this; } - - //===== XAccessibleContext ==================================================== sal_Int32 SAL_CALL AccessibleSlideSorterObject::getAccessibleChildCount (void) @@ -134,9 +114,6 @@ sal_Int32 SAL_CALL AccessibleSlideSorterObject::getAccessibleChildCount (void) return 0; } - - - Reference<XAccessible> SAL_CALL AccessibleSlideSorterObject::getAccessibleChild (sal_Int32 ) throw (lang::IndexOutOfBoundsException, RuntimeException, std::exception) { @@ -144,9 +121,6 @@ Reference<XAccessible> SAL_CALL AccessibleSlideSorterObject::getAccessibleChild throw lang::IndexOutOfBoundsException(); } - - - Reference<XAccessible> SAL_CALL AccessibleSlideSorterObject::getAccessibleParent (void) throw (uno::RuntimeException, std::exception) { @@ -154,9 +128,6 @@ Reference<XAccessible> SAL_CALL AccessibleSlideSorterObject::getAccessibleParent return mxParent; } - - - sal_Int32 SAL_CALL AccessibleSlideSorterObject::getAccessibleIndexInParent() throw (uno::RuntimeException, std::exception) { @@ -183,9 +154,6 @@ sal_Int32 SAL_CALL AccessibleSlideSorterObject::getAccessibleIndexInParent() return nIndexInParent; } - - - sal_Int16 SAL_CALL AccessibleSlideSorterObject::getAccessibleRole (void) throw (uno::RuntimeException, std::exception) { @@ -196,9 +164,6 @@ sal_Int16 SAL_CALL AccessibleSlideSorterObject::getAccessibleRole (void) return nRole; } - - - OUString SAL_CALL AccessibleSlideSorterObject::getAccessibleDescription (void) throw (uno::RuntimeException, std::exception) { @@ -206,9 +171,6 @@ OUString SAL_CALL AccessibleSlideSorterObject::getAccessibleDescription (void) return SD_RESSTR(STR_PAGE); } - - - OUString SAL_CALL AccessibleSlideSorterObject::getAccessibleName (void) throw (uno::RuntimeException, std::exception) { @@ -222,9 +184,6 @@ OUString SAL_CALL AccessibleSlideSorterObject::getAccessibleName (void) return OUString(); } - - - Reference<XAccessibleRelationSet> SAL_CALL AccessibleSlideSorterObject::getAccessibleRelationSet (void) throw (uno::RuntimeException, std::exception) @@ -233,9 +192,6 @@ Reference<XAccessibleRelationSet> SAL_CALL return Reference<XAccessibleRelationSet>(); } - - - Reference<XAccessibleStateSet> SAL_CALL AccessibleSlideSorterObject::getAccessibleStateSet (void) throw (uno::RuntimeException, std::exception) @@ -266,9 +222,6 @@ Reference<XAccessibleStateSet> SAL_CALL return pStateSet; } - - - lang::Locale SAL_CALL AccessibleSlideSorterObject::getLocale (void) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) @@ -287,10 +240,6 @@ lang::Locale SAL_CALL AccessibleSlideSorterObject::getLocale (void) throw IllegalAccessibleComponentStateException(); } - - - - //===== XAccessibleEventBroadcaster =========================================== void SAL_CALL AccessibleSlideSorterObject::addAccessibleEventListener( @@ -315,9 +264,6 @@ void SAL_CALL AccessibleSlideSorterObject::addAccessibleEventListener( } } - - - void SAL_CALL AccessibleSlideSorterObject::removeAccessibleEventListener( const Reference<XAccessibleEventListener>& rxListener) throw (uno::RuntimeException, std::exception) @@ -340,9 +286,6 @@ void SAL_CALL AccessibleSlideSorterObject::removeAccessibleEventListener( } } - - - //===== XAccessibleComponent ================================================== sal_Bool SAL_CALL AccessibleSlideSorterObject::containsPoint(const awt::Point& aPoint) @@ -356,9 +299,6 @@ sal_Bool SAL_CALL AccessibleSlideSorterObject::containsPoint(const awt::Point& a && (aPoint.Y < aSize.Height); } - - - Reference<XAccessible> SAL_CALL AccessibleSlideSorterObject::getAccessibleAtPoint(const awt::Point& ) throw (uno::RuntimeException, std::exception) @@ -366,9 +306,6 @@ Reference<XAccessible> SAL_CALL return NULL; } - - - awt::Rectangle SAL_CALL AccessibleSlideSorterObject::getBounds (void) throw (RuntimeException, std::exception) { @@ -403,9 +340,6 @@ awt::Rectangle SAL_CALL AccessibleSlideSorterObject::getBounds (void) aBBox.GetHeight()); } - - - awt::Point SAL_CALL AccessibleSlideSorterObject::getLocation () throw (RuntimeException, std::exception) { @@ -414,9 +348,6 @@ awt::Point SAL_CALL AccessibleSlideSorterObject::getLocation () return awt::Point(aBBox.X, aBBox.Y); } - - - awt::Point SAL_CALL AccessibleSlideSorterObject::getLocationOnScreen (void) throw (RuntimeException, std::exception) { @@ -440,9 +371,6 @@ awt::Point SAL_CALL AccessibleSlideSorterObject::getLocationOnScreen (void) return aLocation; } - - - awt::Size SAL_CALL AccessibleSlideSorterObject::getSize (void) throw (RuntimeException, std::exception) { @@ -451,18 +379,12 @@ awt::Size SAL_CALL AccessibleSlideSorterObject::getSize (void) return awt::Size(aBBox.Width,aBBox.Height); } - - - void SAL_CALL AccessibleSlideSorterObject::grabFocus (void) throw (RuntimeException, std::exception) { // nothing to do } - - - sal_Int32 SAL_CALL AccessibleSlideSorterObject::getForeground (void) throw (::com::sun::star::uno::RuntimeException, std::exception) { @@ -472,9 +394,6 @@ sal_Int32 SAL_CALL AccessibleSlideSorterObject::getForeground (void) return static_cast<sal_Int32>(nColor); } - - - sal_Int32 SAL_CALL AccessibleSlideSorterObject::getBackground (void) throw (::com::sun::star::uno::RuntimeException, std::exception) { @@ -521,8 +440,6 @@ void AccessibleSlideSorterObject::ThrowIfDisposed (void) } } - - bool AccessibleSlideSorterObject::IsDisposed (void) { return (rBHelper.bDisposed || rBHelper.bInDispose); diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx index 19bfe1870cdf..8a5b2eeff354 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "AccessibleSlideSorterView.hxx" #include "AccessibleSlideSorterObject.hxx" @@ -54,7 +53,6 @@ using namespace ::com::sun::star::accessibility; namespace accessibility { - /** Inner implementation class of the AccessibleSlideSorterView. Note that some event broadcasting is done asynchronously because @@ -107,9 +105,6 @@ private: void UpdateChildren (void); }; - - - //===== AccessibleSlideSorterView ============================================= AccessibleSlideSorterView::AccessibleSlideSorterView( @@ -124,27 +119,16 @@ AccessibleSlideSorterView::AccessibleSlideSorterView( { } - - - - void AccessibleSlideSorterView::Init() { mpImpl.reset(new Implementation(*this,mrSlideSorter,mpContentWindow)); } - - - - AccessibleSlideSorterView::~AccessibleSlideSorterView (void) { Destroyed (); } - - - void AccessibleSlideSorterView::FireAccessibleEvent ( short nEventId, const uno::Any& rOldValue, @@ -163,9 +147,6 @@ void AccessibleSlideSorterView::FireAccessibleEvent ( } } - - - void SAL_CALL AccessibleSlideSorterView::disposing (void) { if (mnClientId != 0) @@ -176,9 +157,6 @@ void SAL_CALL AccessibleSlideSorterView::disposing (void) mpImpl.reset(); } - - - AccessibleSlideSorterObject* AccessibleSlideSorterView::GetAccessibleChildImplementation ( sal_Int32 nIndex) { @@ -261,7 +239,6 @@ sal_Int32 SAL_CALL AccessibleSlideSorterView::getAccessibleIndexInParent (void) const SolarMutexGuard aSolarGuard; sal_Int32 nIndexInParent(-1); - Reference<XAccessibleContext> xParentContext (getAccessibleParent()->getAccessibleContext()); if (xParentContext.is()) { @@ -278,9 +255,6 @@ sal_Int32 SAL_CALL AccessibleSlideSorterView::getAccessibleIndexInParent (void) return nIndexInParent; } - - - sal_Int16 SAL_CALL AccessibleSlideSorterView::getAccessibleRole (void) throw (uno::RuntimeException, std::exception) { @@ -289,9 +263,6 @@ sal_Int16 SAL_CALL AccessibleSlideSorterView::getAccessibleRole (void) return nRole; } - - - OUString SAL_CALL AccessibleSlideSorterView::getAccessibleDescription (void) throw (uno::RuntimeException, std::exception) { @@ -301,9 +272,6 @@ OUString SAL_CALL AccessibleSlideSorterView::getAccessibleDescription (void) return SD_RESSTR(SID_SD_A11Y_I_SLIDEVIEW_D); } - - - OUString SAL_CALL AccessibleSlideSorterView::getAccessibleName (void) throw (uno::RuntimeException, std::exception) { @@ -313,9 +281,6 @@ OUString SAL_CALL AccessibleSlideSorterView::getAccessibleName (void) return SD_RESSTR(SID_SD_A11Y_I_SLIDEVIEW_N); } - - - Reference<XAccessibleRelationSet> SAL_CALL AccessibleSlideSorterView::getAccessibleRelationSet (void) throw (uno::RuntimeException, std::exception) @@ -323,9 +288,6 @@ Reference<XAccessibleRelationSet> SAL_CALL return Reference<XAccessibleRelationSet>(); } - - - Reference<XAccessibleStateSet > SAL_CALL AccessibleSlideSorterView::getAccessibleStateSet (void) throw (uno::RuntimeException, std::exception) @@ -351,9 +313,6 @@ Reference<XAccessibleStateSet > SAL_CALL return pStateSet; } - - - lang::Locale SAL_CALL AccessibleSlideSorterView::getLocale (void) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) @@ -371,9 +330,6 @@ lang::Locale SAL_CALL AccessibleSlideSorterView::getLocale (void) return Application::GetSettings().GetLanguageTag().getLocale(); } - - - void SAL_CALL AccessibleSlideSorterView::addAccessibleEventListener( const Reference<XAccessibleEventListener >& rxListener) throw (RuntimeException, std::exception) @@ -396,9 +352,6 @@ void SAL_CALL AccessibleSlideSorterView::addAccessibleEventListener( } } - - - void SAL_CALL AccessibleSlideSorterView::removeAccessibleEventListener( const Reference<XAccessibleEventListener >& rxListener) throw (RuntimeException, std::exception) @@ -425,9 +378,6 @@ void SAL_CALL AccessibleSlideSorterView::removeAccessibleEventListener( } } - - - //===== XAccessibleComponent ================================================== sal_Bool SAL_CALL AccessibleSlideSorterView::containsPoint (const awt::Point& aPoint) @@ -441,9 +391,6 @@ sal_Bool SAL_CALL AccessibleSlideSorterView::containsPoint (const awt::Point& aP && (aPoint.Y < aBBox.Height); } - - - Reference<XAccessible> SAL_CALL AccessibleSlideSorterView::getAccessibleAtPoint (const awt::Point& aPoint) throw (RuntimeException, std::exception) @@ -462,9 +409,6 @@ Reference<XAccessible> SAL_CALL return xAccessible; } - - - awt::Rectangle SAL_CALL AccessibleSlideSorterView::getBounds (void) throw (uno::RuntimeException, std::exception) { @@ -486,9 +430,6 @@ awt::Rectangle SAL_CALL AccessibleSlideSorterView::getBounds (void) return aBBox; } - - - awt::Point SAL_CALL AccessibleSlideSorterView::getLocation (void) throw (uno::RuntimeException, std::exception) { @@ -505,9 +446,6 @@ awt::Point SAL_CALL AccessibleSlideSorterView::getLocation (void) return aLocation; } - - - /** Calculate the location on screen from the parent's location on screen and our own relative location. */ @@ -534,9 +472,6 @@ awt::Point SAL_CALL AccessibleSlideSorterView::getLocationOnScreen() return aLocationOnScreen; } - - - awt::Size SAL_CALL AccessibleSlideSorterView::getSize (void) throw (uno::RuntimeException, std::exception) { @@ -553,9 +488,6 @@ awt::Size SAL_CALL AccessibleSlideSorterView::getSize (void) return aSize; } - - - void SAL_CALL AccessibleSlideSorterView::grabFocus (void) throw (uno::RuntimeException, std::exception) { @@ -566,9 +498,6 @@ void SAL_CALL AccessibleSlideSorterView::grabFocus (void) mpContentWindow->GrabFocus(); } - - - sal_Int32 SAL_CALL AccessibleSlideSorterView::getForeground (void) throw (RuntimeException, std::exception) { @@ -578,9 +507,6 @@ sal_Int32 SAL_CALL AccessibleSlideSorterView::getForeground (void) return static_cast<sal_Int32>(nColor); } - - - sal_Int32 SAL_CALL AccessibleSlideSorterView::getBackground (void) throw (RuntimeException, std::exception) { @@ -589,9 +515,6 @@ sal_Int32 SAL_CALL AccessibleSlideSorterView::getBackground (void) return static_cast<sal_Int32>(nColor); } - - - //===== XAccessibleSelection ================================================== void SAL_CALL AccessibleSlideSorterView::selectAccessibleChild (sal_Int32 nChildIndex) @@ -608,9 +531,6 @@ void SAL_CALL AccessibleSlideSorterView::selectAccessibleChild (sal_Int32 nChild throw lang::IndexOutOfBoundsException(); } - - - sal_Bool SAL_CALL AccessibleSlideSorterView::isAccessibleChildSelected (sal_Int32 nChildIndex) throw (lang::IndexOutOfBoundsException, RuntimeException, std::exception) @@ -629,9 +549,6 @@ sal_Bool SAL_CALL AccessibleSlideSorterView::isAccessibleChildSelected (sal_Int3 return bIsSelected; } - - - void SAL_CALL AccessibleSlideSorterView::clearAccessibleSelection (void) throw (uno::RuntimeException, std::exception) { @@ -641,9 +558,6 @@ void SAL_CALL AccessibleSlideSorterView::clearAccessibleSelection (void) mrSlideSorter.GetController().GetPageSelector().DeselectAllPages(); } - - - void SAL_CALL AccessibleSlideSorterView::selectAllAccessibleChildren (void) throw (uno::RuntimeException, std::exception) { @@ -653,9 +567,6 @@ void SAL_CALL AccessibleSlideSorterView::selectAllAccessibleChildren (void) mrSlideSorter.GetController().GetPageSelector().SelectAllPages(); } - - - sal_Int32 SAL_CALL AccessibleSlideSorterView::getSelectedAccessibleChildCount (void) throw (uno::RuntimeException, std::exception) { @@ -664,9 +575,6 @@ sal_Int32 SAL_CALL AccessibleSlideSorterView::getSelectedAccessibleChildCount (v return mrSlideSorter.GetController().GetPageSelector().GetSelectedPageCount(); } - - - Reference<XAccessible > SAL_CALL AccessibleSlideSorterView::getSelectedAccessibleChild (sal_Int32 nSelectedChildIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) @@ -690,16 +598,12 @@ Reference<XAccessible > SAL_CALL ++nSelectedCount; } - if ( ! xChild.is() ) throw lang::IndexOutOfBoundsException(); return xChild; } - - - void SAL_CALL AccessibleSlideSorterView::deselectAccessibleChild (sal_Int32 nChildIndex) throw (lang::IndexOutOfBoundsException, RuntimeException, std::exception) @@ -753,16 +657,11 @@ void AccessibleSlideSorterView::ThrowIfDisposed (void) } } - - bool AccessibleSlideSorterView::IsDisposed (void) { return (rBHelper.bDisposed || rBHelper.bInDispose); } - - - //===== AccessibleSlideSorterView::Implementation ============================= AccessibleSlideSorterView::Implementation::Implementation ( @@ -785,9 +684,6 @@ AccessibleSlideSorterView::Implementation::Implementation ( UpdateChildren(); } - - - AccessibleSlideSorterView::Implementation::~Implementation (void) { if (mnUpdateChildrenUserEventId != 0) @@ -798,9 +694,6 @@ AccessibleSlideSorterView::Implementation::~Implementation (void) Clear(); } - - - void AccessibleSlideSorterView::Implementation::RequestUpdateChildren (void) { if (mnUpdateChildrenUserEventId == 0) @@ -809,9 +702,6 @@ void AccessibleSlideSorterView::Implementation::RequestUpdateChildren (void) UpdateChildrenCallback)); } - - - void AccessibleSlideSorterView::Implementation::UpdateChildren (void) { //By default, all children should be accessible. So here workaround is to make all children visible. @@ -844,9 +734,6 @@ void AccessibleSlideSorterView::Implementation::UpdateChildren (void) GetAccessibleChild(nIndex); } - - - void AccessibleSlideSorterView::Implementation::Clear (void) { PageObjectList::iterator iPageObject; @@ -867,9 +754,6 @@ void AccessibleSlideSorterView::Implementation::Clear (void) maPageObjects.clear(); } - - - sal_Int32 AccessibleSlideSorterView::Implementation::GetVisibleChildCount (void) const { if (mnFirstVisibleChild<=mnLastVisibleChild && mnFirstVisibleChild>=0) @@ -878,9 +762,6 @@ sal_Int32 AccessibleSlideSorterView::Implementation::GetVisibleChildCount (void) return 0; } - - - AccessibleSlideSorterObject* AccessibleSlideSorterView::Implementation::GetVisibleChild ( sal_Int32 nIndex) { @@ -889,9 +770,6 @@ AccessibleSlideSorterObject* AccessibleSlideSorterView::Implementation::GetVisib return GetAccessibleChild(nIndex+mnFirstVisibleChild); } - - - AccessibleSlideSorterObject* AccessibleSlideSorterView::Implementation::GetAccessibleChild ( sal_Int32 nIndex) { @@ -928,9 +806,6 @@ AccessibleSlideSorterObject* AccessibleSlideSorterView::Implementation::GetAcces return pChild; } - - - void AccessibleSlideSorterView::Implementation::ConnectListeners (void) { StartListening (*mrSlideSorter.GetModel().GetDocument()); @@ -950,9 +825,6 @@ void AccessibleSlideSorterView::Implementation::ConnectListeners (void) LINK(this,AccessibleSlideSorterView::Implementation,VisibilityChangeListener)); } - - - void AccessibleSlideSorterView::Implementation::ReleaseListeners (void) { mrSlideSorter.GetController().GetFocusManager().RemoveFocusChangeListener( @@ -975,9 +847,6 @@ void AccessibleSlideSorterView::Implementation::ReleaseListeners (void) } } - - - void AccessibleSlideSorterView::Implementation::Notify ( SfxBroadcaster&, const SfxHint& rHint) @@ -1013,7 +882,6 @@ void AccessibleSlideSorterView::Implementation::Notify ( } } - void AccessibleSlideSorterView::SwitchViewActivated (void) { // Firstly, set focus to view @@ -1030,8 +898,6 @@ void AccessibleSlideSorterView::Implementation::Activated() } - - IMPL_LINK(AccessibleSlideSorterView::Implementation, WindowEventListener, VclWindowEvent*, pEvent) { switch (pEvent->GetId()) @@ -1054,9 +920,6 @@ IMPL_LINK(AccessibleSlideSorterView::Implementation, WindowEventListener, VclWin return 1; } - - - IMPL_LINK_NOARG(AccessibleSlideSorterView::Implementation, SelectionChangeListener) { if (mnSelectionChangeUserEventId == 0) @@ -1065,9 +928,6 @@ IMPL_LINK_NOARG(AccessibleSlideSorterView::Implementation, SelectionChangeListen return 1; } - - - IMPL_LINK_NOARG(AccessibleSlideSorterView::Implementation, BroadcastSelectionChange) { mnSelectionChangeUserEventId = 0; @@ -1078,9 +938,6 @@ IMPL_LINK_NOARG(AccessibleSlideSorterView::Implementation, BroadcastSelectionCha return 1; } - - - IMPL_LINK_NOARG(AccessibleSlideSorterView::Implementation, FocusChangeListener) { sal_Int32 nNewFocusedIndex ( @@ -1124,9 +981,6 @@ IMPL_LINK_NOARG(AccessibleSlideSorterView::Implementation, FocusChangeListener) return 1; } - - - IMPL_LINK_NOARG(AccessibleSlideSorterView::Implementation, UpdateChildrenCallback) { mnUpdateChildrenUserEventId = 0; @@ -1135,9 +989,6 @@ IMPL_LINK_NOARG(AccessibleSlideSorterView::Implementation, UpdateChildrenCallbac return 1; } - - - IMPL_LINK_NOARG(AccessibleSlideSorterView::Implementation, VisibilityChangeListener) { UpdateChildren(); diff --git a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx index bdb4141281a8..fc52317bb928 100644 --- a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx +++ b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "AccessibleViewForwarder.hxx" #include <svx/svdpntv.hxx> #include <vcl/outdev.hxx> @@ -51,25 +50,16 @@ AccessibleViewForwarder::AccessibleViewForwarder (SdrPaintView* pView, OutputDev } } - - - AccessibleViewForwarder::~AccessibleViewForwarder (void) { // empty } - - - bool AccessibleViewForwarder::IsValid (void) const { return true; } - - - Rectangle AccessibleViewForwarder::GetVisibleArea (void) const { Rectangle aVisibleArea; @@ -83,9 +73,6 @@ Rectangle AccessibleViewForwarder::GetVisibleArea (void) const return aVisibleArea; } - - - /** Tansform the given point into pixel coordiantes. After the pixel coordiantes of the window origin are added to make the point coordinates absolute. @@ -104,9 +91,6 @@ Point AccessibleViewForwarder::LogicToPixel (const Point& rPoint) const return Point(); } - - - Size AccessibleViewForwarder::LogicToPixel (const Size& rSize) const { OSL_ASSERT (mpView != NULL); @@ -120,9 +104,6 @@ Size AccessibleViewForwarder::LogicToPixel (const Size& rSize) const return Size(); } - - - /** First subtract the window origin to make the point coordinates relative to the window and then transform them into internal coordinates. */ @@ -153,7 +134,6 @@ Size AccessibleViewForwarder::PixelToLogic (const Size& rSize) const return Size(); } - } // end of namespace accessibility /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/accessibility/SdShapeTypes.cxx b/sd/source/ui/accessibility/SdShapeTypes.cxx index fafe9420dcd5..3dfbab2f0c75 100644 --- a/sd/source/ui/accessibility/SdShapeTypes.cxx +++ b/sd/source/ui/accessibility/SdShapeTypes.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "SdShapeTypes.hxx" #include "AccessiblePresentationShape.hxx" #include "AccessiblePresentationGraphicShape.hxx" diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index 5714eeb81a39..e9f1f23d81c8 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/i18n/Collator.hpp> #include <comphelper/processfactory.hxx> @@ -58,15 +57,12 @@ using namespace ::com::sun::star::presentation; namespace sd { - const int ENTRANCE = 0; const int EMPHASIS = 1; const int EXIT = 2; const int MOTIONPATH = 3; const int MISCEFFECTS = 4; - - extern void fillDurationComboBox( ListBox* pBox ); class CategoryListBox : public ListBox @@ -146,16 +142,12 @@ void CategoryListBox::UserDraw( const UserDrawEvent& rUDEvt ) } } - - IMPL_LINK_NOARG(CategoryListBox, implDoubleClickHdl) { CaptureMouse(); return 0; } - - void CategoryListBox::MouseButtonUp( const MouseEvent& rMEvt ) { ReleaseMouse(); @@ -170,8 +162,6 @@ void CategoryListBox::MouseButtonUp( const MouseEvent& rMEvt ) } } - - class CustomAnimationCreateTabPage : public TabPage { public: @@ -410,8 +400,6 @@ PathKind CustomAnimationCreateTabPage::getCreatePathKind() const return eKind; } - - double CustomAnimationCreateTabPage::getDuration() const { sal_Int32 nPos = mpCBSpeed->GetSelectEntryPos(); @@ -473,7 +461,6 @@ void CustomAnimationCreateTabPage::setIsPreview( bool bIsPreview ) mpCBXPReview->Check( bIsPreview ); } - bool CustomAnimationCreateTabPage::select( const OUString& rsPresetId ) { sal_Int32 nPos = mpLBEffects->GetEntryCount(); @@ -494,8 +481,6 @@ bool CustomAnimationCreateTabPage::select( const OUString& rsPresetId ) return false; } - - CustomAnimationCreateDialog::CustomAnimationCreateDialog( Window* pParent, CustomAnimationPane* pPane, const std::vector< ::com::sun::star::uno::Any >& rTargets, bool bHasText, const OUString& rsPresetId, double fDuration ) : TabDialog( pParent, "CustomAnimationCreate", "modules/simpress/ui/customanimationcreatedialog.ui" ) , mpPane( pPane ) diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.hxx b/sd/source/ui/animations/CustomAnimationCreateDialog.hxx index 1c50534b8956..f248f8fbc128 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.hxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.hxx @@ -32,8 +32,6 @@ class HelpButton; namespace sd { - - class CustomAnimationCreateTabPage; class CustomAnimationPane; diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index ae0fea167dae..0af0d213b462 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -99,8 +99,6 @@ extern void fillDurationComboBox( ListBox* pBox ); extern OUString getShapeDescription( const Reference< XShape >& xShape, bool bWithText = true ); extern OUString getPropertyName( sal_Int32 nPropertyType ); - - class PresetPropertyBox : public PropertySubControl { public: @@ -116,8 +114,6 @@ private: ListBox* mpControl; }; - - PresetPropertyBox::PresetPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const OUString& aPresetId, const Link& rModifyHdl ) : PropertySubControl( nControlType ) { @@ -165,29 +161,21 @@ void PresetPropertyBox::setValue( const Any& rValue, const OUString& rPresetId ) } } - - PresetPropertyBox::~PresetPropertyBox() { delete mpControl; } - - Any PresetPropertyBox::getValue() { return makeAny( maPropertyValues[mpControl->GetSelectEntryPos()] ); } - - Control* PresetPropertyBox::getControl() { return mpControl; } - - class ColorPropertyBox : public PropertySubControl { public: @@ -202,8 +190,6 @@ private: ColorListBox* mpControl; }; - - ColorPropertyBox::ColorPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ) : PropertySubControl( nControlType ) { @@ -235,15 +221,11 @@ ColorPropertyBox::ColorPropertyBox( sal_Int32 nControlType, Window* pParent, con } } - - ColorPropertyBox::~ColorPropertyBox() { delete mpControl; } - - void ColorPropertyBox::setValue( const Any& rValue, const OUString& ) { if( mpControl ) @@ -256,22 +238,16 @@ void ColorPropertyBox::setValue( const Any& rValue, const OUString& ) } } - - Any ColorPropertyBox::getValue() { return makeAny( (sal_Int32)mpControl->GetSelectEntryColor().GetRGBColor() ); } - - Control* ColorPropertyBox::getControl() { return mpControl; } - - class FontPropertyBox : public PropertySubControl { public: @@ -287,8 +263,6 @@ private: FontNameBox* mpControl; }; - - FontPropertyBox::FontPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ) : PropertySubControl( nControlType ) { @@ -321,8 +295,6 @@ FontPropertyBox::FontPropertyBox( sal_Int32 nControlType, Window* pParent, const setValue( rValue, aPresetId ); } - - void FontPropertyBox::setValue( const Any& rValue, const OUString& ) { if( mpControl ) @@ -333,30 +305,22 @@ void FontPropertyBox::setValue( const Any& rValue, const OUString& ) } } - - FontPropertyBox::~FontPropertyBox() { delete mpControl; } - - Any FontPropertyBox::getValue() { OUString aFontName( mpControl->GetText() ); return makeAny( aFontName ); } - - Control* FontPropertyBox::getControl() { return mpControl; } - - class DropdownMenuBox : public Edit { public: @@ -374,8 +338,6 @@ private: PopupMenu* mpMenu; }; - - DropdownMenuBox::DropdownMenuBox( Window* pParent, Edit* pSubControl, PopupMenu* pMenu ) : Edit( pParent, WB_BORDER|WB_TABSTOP| WB_DIALOGCONTROL ), mpSubControl(pSubControl),mpDropdownButton(0),mpMenu(pMenu) @@ -390,8 +352,6 @@ DropdownMenuBox::DropdownMenuBox( Window* pParent, Edit* pSubControl, PopupMenu* mpSubControl->Show(); } - - DropdownMenuBox::~DropdownMenuBox() { SetSubEdit( 0 ); @@ -400,8 +360,6 @@ DropdownMenuBox::~DropdownMenuBox() delete mpMenu; } - - void DropdownMenuBox::Resize() { Size aOutSz = GetOutputSizePixel(); @@ -412,8 +370,6 @@ void DropdownMenuBox::Resize() mpDropdownButton->setPosSizePixel( aOutSz.Width() - nSBWidth, 0, nSBWidth, aOutSz.Height() ); } - - bool DropdownMenuBox::PreNotify( NotifyEvent& rNEvt ) { bool nResult = true; @@ -439,8 +395,6 @@ bool DropdownMenuBox::PreNotify( NotifyEvent& rNEvt ) return nResult; } - - class CharHeightPropertyBox : public PropertySubControl { public: @@ -460,8 +414,6 @@ private: MetricField* mpMetric; }; - - CharHeightPropertyBox::CharHeightPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ) : PropertySubControl( nControlType ) { @@ -480,15 +432,11 @@ CharHeightPropertyBox::CharHeightPropertyBox( sal_Int32 nControlType, Window* pP setValue( rValue, aPresetId ); } - - CharHeightPropertyBox::~CharHeightPropertyBox() { delete mpControl; } - - IMPL_LINK( CharHeightPropertyBox, implMenuSelectHdl, MenuButton*, pPb ) { long nValue = 100; @@ -504,8 +452,6 @@ IMPL_LINK( CharHeightPropertyBox, implMenuSelectHdl, MenuButton*, pPb ) return 0; } - - void CharHeightPropertyBox::setValue( const Any& rValue, const OUString& ) { if( mpMetric ) @@ -516,22 +462,16 @@ void CharHeightPropertyBox::setValue( const Any& rValue, const OUString& ) } } - - Any CharHeightPropertyBox::getValue() { return makeAny( (double)((double)mpMetric->GetValue() / 100.0) ); } - - Control* CharHeightPropertyBox::getControl() { return mpControl; } - - class TransparencyPropertyBox : public PropertySubControl { public: @@ -555,8 +495,6 @@ private: Link maModifyHdl; }; - - TransparencyPropertyBox::TransparencyPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ) : PropertySubControl( nControlType ) , maModifyHdl( rModifyHdl ) @@ -585,15 +523,11 @@ TransparencyPropertyBox::TransparencyPropertyBox( sal_Int32 nControlType, Window setValue( rValue, aPresetId ); } - - TransparencyPropertyBox::~TransparencyPropertyBox() { delete mpControl; } - - void TransparencyPropertyBox::updateMenu() { sal_Int64 nValue = mpMetric->GetValue(); @@ -601,8 +535,6 @@ void TransparencyPropertyBox::updateMenu() mpMenu->CheckItem( i, nValue == i ); } - - IMPL_LINK_NOARG(TransparencyPropertyBox, implModifyHdl) { updateMenu(); @@ -611,8 +543,6 @@ IMPL_LINK_NOARG(TransparencyPropertyBox, implModifyHdl) return 0; } - - IMPL_LINK( TransparencyPropertyBox, implMenuSelectHdl, MenuButton*, pPb ) { if( pPb->GetCurItemId() != mpMetric->GetValue() ) @@ -624,8 +554,6 @@ IMPL_LINK( TransparencyPropertyBox, implMenuSelectHdl, MenuButton*, pPb ) return 0; } - - void TransparencyPropertyBox::setValue( const Any& rValue, const OUString& ) { if( mpMetric ) @@ -638,22 +566,16 @@ void TransparencyPropertyBox::setValue( const Any& rValue, const OUString& ) } } - - Any TransparencyPropertyBox::getValue() { return makeAny( (double)((double)mpMetric->GetValue()) / 100.0 ); } - - Control* TransparencyPropertyBox::getControl() { return mpControl; } - - class RotationPropertyBox : public PropertySubControl { public: @@ -677,8 +599,6 @@ private: Link maModifyHdl; }; - - RotationPropertyBox::RotationPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ) : PropertySubControl( nControlType ) , maModifyHdl( rModifyHdl ) @@ -701,15 +621,11 @@ RotationPropertyBox::RotationPropertyBox( sal_Int32 nControlType, Window* pParen setValue( rValue, aPresetId ); } - - RotationPropertyBox::~RotationPropertyBox() { delete mpControl; } - - void RotationPropertyBox::updateMenu() { sal_Int64 nValue = mpMetric->GetValue(); @@ -725,8 +641,6 @@ void RotationPropertyBox::updateMenu() mpMenu->CheckItem( CM_COUNTERCLOCKWISE, !bDirection ); } - - IMPL_LINK_NOARG(RotationPropertyBox, implModifyHdl) { updateMenu(); @@ -765,8 +679,6 @@ IMPL_LINK( RotationPropertyBox, implMenuSelectHdl, MenuButton*, pPb ) return 0; } - - void RotationPropertyBox::setValue( const Any& rValue, const OUString& ) { if( mpMetric ) @@ -779,22 +691,16 @@ void RotationPropertyBox::setValue( const Any& rValue, const OUString& ) } } - - Any RotationPropertyBox::getValue() { return makeAny( (double)((double)mpMetric->GetValue()) ); } - - Control* RotationPropertyBox::getControl() { return mpControl; } - - class ScalePropertyBox : public PropertySubControl { public: @@ -819,8 +725,6 @@ private: int mnDirection; }; - - ScalePropertyBox::ScalePropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ) : PropertySubControl( nControlType ) , maModifyHdl( rModifyHdl ) @@ -842,15 +746,11 @@ ScalePropertyBox::ScalePropertyBox( sal_Int32 nControlType, Window* pParent, con setValue( rValue, aPresetId ); } - - ScalePropertyBox::~ScalePropertyBox() { delete mpControl; } - - void ScalePropertyBox::updateMenu() { sal_Int64 nValue = mpMetric->GetValue(); @@ -865,8 +765,6 @@ void ScalePropertyBox::updateMenu() mpMenu->CheckItem( CM_BOTH, mnDirection == 3 ); } - - IMPL_LINK_NOARG(ScalePropertyBox, implModifyHdl) { updateMenu(); @@ -914,8 +812,6 @@ IMPL_LINK( ScalePropertyBox, implMenuSelectHdl, MenuButton*, pPb ) return 0; } - - void ScalePropertyBox::setValue( const Any& rValue, const OUString& ) { if( mpMetric ) @@ -946,8 +842,6 @@ void ScalePropertyBox::setValue( const Any& rValue, const OUString& ) } } - - Any ScalePropertyBox::getValue() { double fValue1 = (double)((double)mpMetric->GetValue() / 100.0); @@ -965,15 +859,11 @@ Any ScalePropertyBox::getValue() return makeAny( aValues ); } - - Control* ScalePropertyBox::getControl() { return mpControl; } - - class FontStylePropertyBox : public PropertySubControl { public: @@ -1000,8 +890,6 @@ private: sal_Int16 mnFontUnderline; }; - - FontStylePropertyBox::FontStylePropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ) : PropertySubControl( nControlType ) , maModifyHdl( rModifyHdl ) @@ -1018,15 +906,11 @@ FontStylePropertyBox::FontStylePropertyBox( sal_Int32 nControlType, Window* pPar setValue( rValue, aPresetId ); } - - FontStylePropertyBox::~FontStylePropertyBox() { delete mpControl; } - - void FontStylePropertyBox::update() { // update menu @@ -1043,8 +927,6 @@ void FontStylePropertyBox::update() mpEdit->Invalidate(); } - - IMPL_LINK( FontStylePropertyBox, implMenuSelectHdl, MenuButton*, pPb ) { switch( pPb->GetCurItemId() ) @@ -1077,8 +959,6 @@ IMPL_LINK( FontStylePropertyBox, implMenuSelectHdl, MenuButton*, pPb ) return 0; } - - void FontStylePropertyBox::setValue( const Any& rValue, const OUString& ) { Sequence<Any> aValues; @@ -1091,8 +971,6 @@ void FontStylePropertyBox::setValue( const Any& rValue, const OUString& ) update(); } - - Any FontStylePropertyBox::getValue() { Sequence<Any> aValues(3); @@ -1102,15 +980,11 @@ Any FontStylePropertyBox::getValue() return makeAny( aValues ); } - - Control* FontStylePropertyBox::getControl() { return mpControl; } - - class CustomAnimationEffectTabPage : public TabPage { public: @@ -1211,10 +1085,8 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con OUString aPresetId; pSet->getPropertyValue( nHandlePresetId ) >>= aPresetId; - // property 1 - if( pSet->getPropertyState( nHandleProperty1Type ) != STLPropertyState_AMBIGUOUS ) { sal_Int32 nType = 0; @@ -1242,10 +1114,8 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con mpFTProperty1->Enable( mpLBProperty1->IsEnabled() ); - // accelerate & deccelerate - if( pSet->getPropertyState( nHandleAccelerate ) == STLPropertyState_DIRECT ) { mpCBSmoothStart->Show(); @@ -1260,10 +1130,8 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con } } - // init after effect controls - mpLBAfterEffect->SetSelectHdl( LINK( this, CustomAnimationEffectTabPage, implSelectHdl ) ); mpLBTextAnim->SetSelectHdl( LINK( this, CustomAnimationEffectTabPage, implSelectHdl ) ); @@ -1523,8 +1391,6 @@ void CustomAnimationEffectTabPage::update( STLPropertySet* pSet ) pSet->setPropertyValue( nHandleAfterEffectOnNextEffect, makeAny( bAfterEffectOnNextEffect ) ); } - - nPos = mpLBTextAnim->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { @@ -1547,8 +1413,6 @@ void CustomAnimationEffectTabPage::update( STLPropertySet* pSet ) pSet->setPropertyValue( nHandleIterateType, makeAny( nIterateType ) ); } - - { double fIterateInterval = static_cast< double >( mpMFTextDelay->GetValue() ) / 10; double fOldIterateInterval = -1.0; @@ -1930,8 +1794,6 @@ void CustomAnimationDurationTabPage::update( STLPropertySet* pSet ) pSet->setPropertyValue( nHandleStart, makeAny( nStart ) ); } - - { double fBegin = static_cast<double>( mpMFStartDelay->GetValue()) / 10.0; double fOldBegin = -1.0; @@ -1943,8 +1805,6 @@ void CustomAnimationDurationTabPage::update( STLPropertySet* pSet ) pSet->setPropertyValue( nHandleBegin, makeAny( fBegin ) ); } - - nPos = mpCBRepeat->GetSelectEntryPos(); if( (nPos != LISTBOX_ENTRY_NOTFOUND) || (!mpCBRepeat->GetText().isEmpty()) ) { @@ -1989,8 +1849,6 @@ void CustomAnimationDurationTabPage::update( STLPropertySet* pSet ) pSet->setPropertyValue( nHandleEnd, aEnd ); } - - double fDuration = -1.0; nPos = mpCBDuration->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) @@ -2017,8 +1875,6 @@ void CustomAnimationDurationTabPage::update( STLPropertySet* pSet ) pSet->setPropertyValue( nHandleDuration, makeAny( fDuration ) ); } - - if( mpCBXRewind->GetState() != TRISTATE_INDET ) { sal_Int16 nFill = mpCBXRewind->IsChecked() ? AnimationFill::REMOVE : AnimationFill::HOLD; @@ -2053,7 +1909,6 @@ void CustomAnimationDurationTabPage::update( STLPropertySet* pSet ) } } - if( xTrigger.is() || mpRBClickSequence->IsChecked() ) { Any aNewValue( makeAny( xTrigger ) ); @@ -2249,8 +2104,6 @@ IMPL_LINK_NOARG(CustomAnimationTextAnimTabPage, implSelectHdl) return 0; } - - CustomAnimationDialog::CustomAnimationDialog(Window* pParent, STLPropertySet* pSet, const OString& sPage) : TabDialog( pParent, "CustomAnimationProperties", "modules/simpress/ui/customanimationproperties.ui") , mpSet( pSet ) @@ -2405,8 +2258,6 @@ void PropertyControl::Resize() ListBox::Resize(); } - - PropertySubControl::~PropertySubControl() { } diff --git a/sd/source/ui/animations/CustomAnimationDialog.hxx b/sd/source/ui/animations/CustomAnimationDialog.hxx index 75ff871799bc..f4e922519eb4 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.hxx +++ b/sd/source/ui/animations/CustomAnimationDialog.hxx @@ -31,9 +31,6 @@ class CancelButton; class HelpButton; namespace sd { - - - // property handles const sal_Int32 nHandleSound = 0; const sal_Int32 nHandleHasAfterEffect = 1; @@ -97,8 +94,6 @@ const sal_Int32 nPropertyTypeTransparency = 19; const sal_Int32 nPropertyTypeFontStyle = 20; const sal_Int32 nPropertyTypeScale = 21; - - class PropertySubControl { public: @@ -123,8 +118,6 @@ protected: sal_Int32 mnType; }; - - class PropertyControl : public ListBox { public: @@ -140,8 +133,6 @@ private: PropertySubControl* mpSubControl; }; - - class CustomAnimationDurationTabPage; class CustomAnimationEffectTabPage; class CustomAnimationTextAnimTabPage; diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index 69eebe20abef..3a23857f4c3a 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -198,8 +198,6 @@ static OUString getDescription( const Any& rTarget, bool bWithText = true ) return aDescription; } - - class CustomAnimationListEntryItem : public SvLBoxString { public: @@ -217,8 +215,6 @@ private: CustomAnimationEffectPtr mpEffect; }; - - CustomAnimationListEntryItem::CustomAnimationListEntryItem( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const OUString& aDescription, CustomAnimationEffectPtr pEffect, CustomAnimationList* pParent ) : SvLBoxString( pEntry, nFlags, aDescription ) , mpParent( pParent ) @@ -227,14 +223,10 @@ CustomAnimationListEntryItem::CustomAnimationListEntryItem( SvTreeListEntry* pEn { } - - CustomAnimationListEntryItem::~CustomAnimationListEntryItem() { } - - void CustomAnimationListEntryItem::InitViewData( SvTreeListBox* pView, SvTreeListEntry* pEntry, SvViewDataItem* pViewData ) { if( !pViewData ) @@ -246,8 +238,6 @@ void CustomAnimationListEntryItem::InitViewData( SvTreeListBox* pView, SvTreeLis pViewData->maSize = aSize; } - - void CustomAnimationListEntryItem::Paint( const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* /*pView*/, const SvTreeListEntry* pEntry) { @@ -303,21 +293,15 @@ void CustomAnimationListEntryItem::Paint( rDev.DrawText( aPos, rDev.GetEllipsisString( maDescription, rDev.GetOutputSizePixel().Width() - aPos.X() ) ); } - - SvLBoxItem* CustomAnimationListEntryItem::Create() const { return NULL; } - - void CustomAnimationListEntryItem::Clone( SvLBoxItem* ) { } - - class CustomAnimationListEntry : public SvTreeListEntry { public: @@ -331,27 +315,19 @@ private: CustomAnimationEffectPtr mpEffect; }; - - CustomAnimationListEntry::CustomAnimationListEntry() { } - - CustomAnimationListEntry::CustomAnimationListEntry( CustomAnimationEffectPtr pEffect ) : mpEffect( pEffect ) { } - - CustomAnimationListEntry::~CustomAnimationListEntry() { } - - class CustomAnimationTriggerEntryItem : public SvLBoxString { public: @@ -367,20 +343,15 @@ private: OUString maDescription; }; - - CustomAnimationTriggerEntryItem::CustomAnimationTriggerEntryItem( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const OUString& aDescription ) : SvLBoxString( pEntry, nFlags, aDescription ), maDescription( aDescription ) { } - - CustomAnimationTriggerEntryItem::~CustomAnimationTriggerEntryItem() { } - void CustomAnimationTriggerEntryItem::InitViewData( SvTreeListBox* pView, SvTreeListEntry* pEntry, SvViewDataItem* pViewData ) { if( !pViewData ) @@ -392,8 +363,6 @@ void CustomAnimationTriggerEntryItem::InitViewData( SvTreeListBox* pView, SvTree pViewData->maSize = aSize; } - - void CustomAnimationTriggerEntryItem::Paint( const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* /*pView*/, const SvTreeListEntry* /*pEntry*/) { @@ -432,21 +401,15 @@ void CustomAnimationTriggerEntryItem::Paint( rDev.Pop(); } - - SvLBoxItem* CustomAnimationTriggerEntryItem::Create() const { return NULL; } - - void CustomAnimationTriggerEntryItem::Clone( SvLBoxItem* ) { } - - CustomAnimationList::CustomAnimationList( ::Window* pParent ) : SvTreeListBox( pParent, WB_TABSTOP | WB_BORDER | WB_HASLINES | WB_HASBUTTONS | WB_HASBUTTONSATROOT ) , mbIgnorePaint(false) @@ -466,8 +429,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeCustomAnimationList( ::Wind return new CustomAnimationList( pParent ); } - - const Image& CustomAnimationList::getImage( sal_uInt16 nId ) { DBG_ASSERT( (nId >= IMG_CUSTOMANIMATION_ON_CLICK) && (nId <= IMG_CUSTOMANIMATION_MEDIA_STOP), "sd::CustomAnimationList::getImage(), illegal index!" ); @@ -481,8 +442,6 @@ const Image& CustomAnimationList::getImage( sal_uInt16 nId ) return rImage; } - - CustomAnimationList::~CustomAnimationList() { if( mpMainSequence.get() ) @@ -491,8 +450,6 @@ CustomAnimationList::~CustomAnimationList() clear(); } - - void CustomAnimationList::KeyInput( const KeyEvent& rKEvt ) { const int nKeyCode = rKEvt.GetKeyCode().GetCode(); @@ -513,8 +470,6 @@ void CustomAnimationList::KeyInput( const KeyEvent& rKEvt ) ::SvTreeListBox::KeyInput( rKEvt ); } - - /** selects or deselects the given effect. Selections of other effects are not changed */ void CustomAnimationList::select( CustomAnimationEffectPtr pEffect, bool bSelect /* = true */ ) @@ -538,8 +493,6 @@ void CustomAnimationList::select( CustomAnimationEffectPtr pEffect, bool bSelect } } - - void CustomAnimationList::clear() { Clear(); @@ -548,8 +501,6 @@ void CustomAnimationList::clear() mxLastTargetShape = 0; } - - void CustomAnimationList::update( MainSequencePtr pMainSequence ) { if( mpMainSequence.get() ) @@ -562,8 +513,6 @@ void CustomAnimationList::update( MainSequencePtr pMainSequence ) mpMainSequence->addListener( this ); } - - struct stl_append_effect_func : public std::unary_function<CustomAnimationEffectPtr, void> { stl_append_effect_func( CustomAnimationList& rList ) : mrList( rList ) {} @@ -576,7 +525,6 @@ void stl_append_effect_func::operator()(CustomAnimationEffectPtr pEffect) mrList.append( pEffect ); } - void CustomAnimationList::update() { mbIgnorePaint = true; @@ -747,8 +695,6 @@ void CustomAnimationList::update() Invalidate(); } - - void CustomAnimationList::append( CustomAnimationEffectPtr pEffect ) { // create a ui description @@ -797,8 +743,6 @@ void CustomAnimationList::append( CustomAnimationEffectPtr pEffect ) } } - - void selectShape( SvTreeListBox* pTreeList, Reference< XShape > xShape ) { CustomAnimationListEntry* pEntry = static_cast< CustomAnimationListEntry* >(pTreeList->First()); @@ -815,8 +759,6 @@ void selectShape( SvTreeListBox* pTreeList, Reference< XShape > xShape ) } } - - void CustomAnimationList::onSelectionChanged( Any aSelection ) { try @@ -853,8 +795,6 @@ void CustomAnimationList::onSelectionChanged( Any aSelection ) } } - - void CustomAnimationList::SelectHdl() { if( mbIgnorePaint ) @@ -863,8 +803,6 @@ void CustomAnimationList::SelectHdl() mpController->onSelect(); } - - bool CustomAnimationList::isExpanded( const CustomAnimationEffectPtr& pEffect ) const { CustomAnimationListEntry* pEntry = static_cast<CustomAnimationListEntry*>(First()); @@ -883,7 +821,6 @@ bool CustomAnimationList::isExpanded( const CustomAnimationEffectPtr& pEffect ) return (pEntry == 0) || IsExpanded( pEntry ); } - EffectSequence CustomAnimationList::getSelection() const { EffectSequence aSelection; @@ -919,16 +856,12 @@ EffectSequence CustomAnimationList::getSelection() const return aSelection; } - - bool CustomAnimationList::DoubleClickHdl() { mpController->onDoubleClick(); return false; } - - PopupMenu* CustomAnimationList::CreateContextMenu() { PopupMenu* pMenu = new PopupMenu(SdResId( RID_EFFECT_CONTEXTMENU )); @@ -969,22 +902,16 @@ PopupMenu* CustomAnimationList::CreateContextMenu() return pMenu; } - - void CustomAnimationList::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) { mpController->onContextMenu( nSelectedPopupEntry ); } - - void CustomAnimationList::SetTabs() { SvTreeListBox::SetTabs(); } - - void CustomAnimationList::notify_change() { update(); diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 775c8e299bb5..31589bc9e49c 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/presentation/EffectPresetClass.hpp> #include <com/sun/star/animations/XAnimationNodeSupplier.hpp> #include <com/sun/star/animations/ParallelTimeContainer.hpp> @@ -105,8 +104,6 @@ using ::sd::framework::FrameworkHelper; namespace sd { - - void fillDurationComboBox( ListBox* pBox ) { static const double gdVerySlow = 5.0; @@ -149,9 +146,6 @@ void fillRepeatComboBox( ListBox* pBox ) pBox->SetEntryData( pBox->InsertEntry( aEndOfSlide ), (void*)((sal_Int32)-2) ); } - - - CustomAnimationPane::CustomAnimationPane( ::Window* pParent, ViewShellBase& rBase, const cssu::Reference<css::frame::XFrame>& rxFrame, const Size& rMinSize ) @@ -804,18 +798,12 @@ void CustomAnimationPane::onContextMenu( sal_uInt16 nSelectedPopupEntry ) updateControls(); } - - - void CustomAnimationPane::DataChanged (const DataChangedEvent& rEvent) { (void)rEvent; UpdateLook(); } - - - void CustomAnimationPane::UpdateLook (void) { const Wallpaper aBackground ( @@ -830,9 +818,6 @@ void CustomAnimationPane::UpdateLook (void) mpFTSpeed->SetBackground(aBackground); } - - - void addValue( STLPropertySet* pSet, sal_Int32 nHandle, const Any& rValue ) { switch( pSet->getPropertyState( nHandle ) ) @@ -2207,7 +2192,6 @@ void CustomAnimationPane::preview( const Reference< XAnimationNode >& xAnimation SlideShow::StartPreview( mrBase, mxCurrentPage, xRoot ); } - // ICustomAnimationListController void CustomAnimationPane::onSelect() { @@ -2216,9 +2200,6 @@ void CustomAnimationPane::onSelect() markShapesFromSelectedEffects(); } - - - const CustomAnimationPresets& CustomAnimationPane::getPresets (void) { if (mpCustomAnimationPresets == NULL) @@ -2226,8 +2207,6 @@ const CustomAnimationPresets& CustomAnimationPane::getPresets (void) return *mpCustomAnimationPresets; } - - void CustomAnimationPane::markShapesFromSelectedEffects() { if( !maSelectionLock.isLocked() ) @@ -2255,7 +2234,6 @@ void CustomAnimationPane::markShapesFromSelectedEffects() } } - void CustomAnimationPane::updatePathFromMotionPathTag( const rtl::Reference< MotionPathTag >& xTag ) { MainSequenceRebuildGuard aGuard( mpMainSequence ); @@ -2278,9 +2256,6 @@ void CustomAnimationPane::updatePathFromMotionPathTag( const rtl::Reference< Mot } } - - - ::Window * createCustomAnimationPanel( ::Window* pParent, ViewShellBase& rBase, const cssu::Reference<css::frame::XFrame>& rxFrame ) { ::Window* pWindow = 0; @@ -2295,7 +2270,6 @@ void CustomAnimationPane::updatePathFromMotionPathTag( const rtl::Reference< Mot return pWindow; } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx index 1f71fe02936b..c2665b76e2be 100644 --- a/sd/source/ui/animations/CustomAnimationPane.hxx +++ b/sd/source/ui/animations/CustomAnimationPane.hxx @@ -58,8 +58,6 @@ class ViewShellBase; typedef std::vector< rtl::Reference< MotionPathTag > > MotionPathTagVector; - - class CustomAnimationPane : public PanelLayout, public ICustomAnimationListController { friend class MotionPathTag; diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index 2e7f4db1f3e4..4a9312461a29 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -52,7 +52,6 @@ #include <algorithm> - using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; @@ -61,8 +60,6 @@ using ::com::sun::star::uno::RuntimeException; using ::sd::framework::FrameworkHelper; - - // ::sd::impl::TransitionEffect namespace sd { @@ -222,8 +219,6 @@ struct TransitionEffect } // namespace impl } // namespace sd - - // Local Helper Functions namespace { @@ -413,8 +408,6 @@ void lcl_FillSoundListBox( namespace sd { - - // SlideTransitionPane SlideTransitionPane::SlideTransitionPane( ::Window * pParent, @@ -494,16 +487,12 @@ SlideTransitionPane::~SlideTransitionPane() removeListener(); } - void SlideTransitionPane::DataChanged (const DataChangedEvent& rEvent) { (void)rEvent; UpdateLook(); } - - - void SlideTransitionPane::UpdateLook (void) { SetBackground(::sfx2::sidebar::Theme::GetWallpaper(::sfx2::sidebar::Theme::Paint_PanelBackground)); @@ -511,7 +500,6 @@ void SlideTransitionPane::UpdateLook (void) mpFT_SOUND->SetBackground(Wallpaper()); } - void SlideTransitionPane::onSelectionChanged() { updateControls(); @@ -989,7 +977,6 @@ IMPL_LINK_NOARG(SlideTransitionPane, ApplyToAllButtonClicked) return 0; } - IMPL_LINK_NOARG(SlideTransitionPane, PlayButtonClicked) { playCurrentEffect(); diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx index c2d5c14f5684..29ecd77b1f81 100644 --- a/sd/source/ui/animations/motionpathtag.cxx +++ b/sd/source/ui/animations/motionpathtag.cxx @@ -68,8 +68,6 @@ namespace sd const sal_uInt32 SMART_TAG_HDL_NUM = SAL_MAX_UINT32; static const int DRGPIX = 2; // Drag MinMove in Pixel - - class PathDragMove : public SdrDragMove { private: @@ -133,7 +131,6 @@ bool PathDragMove::EndSdrDrag(bool /*bCopy*/) return true; } - class PathDragResize : public SdrDragResize { private: @@ -193,8 +190,6 @@ bool PathDragResize::EndSdrDrag(bool /*bCopy*/) return true; } - - class PathDragObjOwn : public SdrDragObjOwn { private: @@ -245,8 +240,6 @@ bool PathDragObjOwn::EndSdrDrag(bool /*bCopy*/) } } - - class SdPathHdl : public SmartHdl { public: @@ -262,8 +255,6 @@ private: rtl::Reference< MotionPathTag > mxTag; }; - - SdPathHdl::SdPathHdl( const SmartTagReference& xTag, SdrPathObj* pPathObj ) : SmartHdl( xTag, pPathObj->GetCurrentBoundRect().TopLeft() ) , mpPathObj( pPathObj ) @@ -271,14 +262,10 @@ SdPathHdl::SdPathHdl( const SmartTagReference& xTag, SdrPathObj* pPathObj ) { } - - SdPathHdl::~SdPathHdl() { } - - void SdPathHdl::CreateB2dIAObject() { // first throw away old one @@ -317,22 +304,16 @@ void SdPathHdl::CreateB2dIAObject() } } - - bool SdPathHdl::IsFocusHdl() const { return false; } - - bool SdPathHdl::isMarkable() const { return false; } - - Pointer SdPathHdl::GetSdrDragPointer() const { PointerStyle eStyle = POINTER_NOTALLOWED; @@ -354,8 +335,6 @@ Pointer SdPathHdl::GetSdrDragPointer() const return Pointer( eStyle ); } - - MotionPathTag::MotionPathTag( CustomAnimationPane& rPane, ::sd::View& rView, const CustomAnimationEffectPtr& pEffect ) : SmartTag( rView ) , mrPane( rPane ) @@ -408,16 +387,12 @@ MotionPathTag::MotionPathTag( CustomAnimationPane& rPane, ::sd::View& rView, con } } - - MotionPathTag::~MotionPathTag() { DBG_ASSERT( mpPathObj == 0, "sd::MotionPathTag::~MotionPathTag(), dispose me first!" ); Dispose(); } - - void MotionPathTag::updatePathAttributes() { OUString aEmpty( "?" ); @@ -446,8 +421,6 @@ void MotionPathTag::updatePathAttributes() } } - - void MotionPathTag::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) { if( mpPathObj && !mbInUpdatePath && dynamic_cast< const SdrHint* >( &rHint ) && (mpEffect.get() != 0) ) @@ -465,8 +438,6 @@ void MotionPathTag::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) } } - - void MotionPathTag::MovePath( int nDX, int nDY ) { if( mpPathObj ) @@ -476,8 +447,6 @@ void MotionPathTag::MovePath( int nDX, int nDY ) } } - - /** returns true if the MotionPathTag handled the event. */ bool MotionPathTag::MouseButtonDown( const MouseEvent& rMEvt, SmartHdl& rHdl ) { @@ -569,7 +538,6 @@ bool MotionPathTag::MouseButtonDown( const MouseEvent& rMEvt, SmartHdl& rHdl ) mrView.MarkPoint(*pHdl); } - if( pHdl && !rMEvt.IsRight() ) { mrView.BrkAction(); @@ -606,8 +574,6 @@ bool MotionPathTag::MouseButtonDown( const MouseEvent& rMEvt, SmartHdl& rHdl ) return false; } - - /** returns true if the SmartTag consumes this event. */ bool MotionPathTag::KeyInput( const KeyEvent& rKEvt ) { @@ -816,8 +782,6 @@ bool MotionPathTag::OnMove( const KeyEvent& rKEvt ) return true; } - - sal_uLong MotionPathTag::GetMarkablePointCount() const { if( mpPathObj && isSelected() ) @@ -830,8 +794,6 @@ sal_uLong MotionPathTag::GetMarkablePointCount() const } } - - sal_uLong MotionPathTag::GetMarkedPointCount() const { if( mpMark ) @@ -845,8 +807,6 @@ sal_uLong MotionPathTag::GetMarkedPointCount() const } } - - bool MotionPathTag::MarkPoint(SdrHdl& rHdl, bool bUnmark ) { bool bRet=false; @@ -866,8 +826,6 @@ bool MotionPathTag::MarkPoint(SdrHdl& rHdl, bool bUnmark ) return bRet; } - - bool MotionPathTag::MarkPoints(const Rectangle* pRect, bool bUnmark ) { bool bChgd=false; @@ -897,8 +855,6 @@ bool MotionPathTag::MarkPoints(const Rectangle* pRect, bool bUnmark ) return bChgd; } - - bool MotionPathTag::getContext( SdrViewContext& rContext ) { if( mpPathObj && isSelected() && !mrView.IsFrameDragSingles() ) @@ -912,8 +868,6 @@ bool MotionPathTag::getContext( SdrViewContext& rContext ) } } - - void MotionPathTag::CheckPossibilities() { if( mpPathObj ) @@ -941,8 +895,6 @@ void MotionPathTag::CheckPossibilities() } } - - void MotionPathTag::addCustomHandles( SdrHdlList& rHandlerList ) { if( mpPathObj ) @@ -964,7 +916,6 @@ void MotionPathTag::addCustomHandles( SdrHdlList& rHandlerList ) pHdl->SetObjHdlNum( SMART_TAG_HDL_NUM ); pHdl->SetPageView( mrView.GetSdrPageView() ); - pHdl->SetObj(mpPathObj); rHandlerList.AddHdl( pHdl ); @@ -1054,8 +1005,6 @@ void MotionPathTag::addCustomHandles( SdrHdlList& rHandlerList ) } } - - void MotionPathTag::disposing() { Reference< XChangesNotifier > xNotifier( mpEffect->getNode(), UNO_QUERY ); @@ -1082,8 +1031,6 @@ void MotionPathTag::disposing() SmartTag::disposing(); } - - void MotionPathTag::deselect() { SmartTag::deselect(); @@ -1110,7 +1057,6 @@ void MotionPathTag::selectionChanged() // IPolyPolygonEditorController - void MotionPathTag::DeleteMarkedPoints() { if( mpPathObj && IsDeleteMarkedPointsPossible() ) diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 18e7c9e31d62..8213cd9d8e9c 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "sddll.hxx" #include <com/sun/star/beans/XMultiPropertyStates.hpp> @@ -102,12 +101,8 @@ using namespace ::com::sun::star::office; namespace sd { - - extern TextApiObject* getTextApiObject( const Reference< XAnnotation >& xAnnotation ); - - SfxItemPool* GetAnnotationPool() { static SfxItemPool* mpAnnotationPool = 0; @@ -123,8 +118,6 @@ SfxItemPool* GetAnnotationPool() return mpAnnotationPool; } - - static SfxBindings* getBindings( ViewShellBase& rBase ) { if( rBase.GetMainViewShell().get() && rBase.GetMainViewShell()->GetViewFrame() ) @@ -133,8 +126,6 @@ static SfxBindings* getBindings( ViewShellBase& rBase ) return 0; } - - static SfxDispatcher* getDispatcher( ViewShellBase& rBase ) { if( rBase.GetMainViewShell().get() && rBase.GetMainViewShell()->GetViewFrame() ) @@ -178,8 +169,6 @@ OUString getAnnotationDateTimeString( const Reference< XAnnotation >& xAnnotatio return sRet; } - - AnnotationManagerImpl::AnnotationManagerImpl( ViewShellBase& rViewShellBase ) : AnnotationManagerImplBase( m_aMutex ) , mrBase( rViewShellBase ) @@ -192,8 +181,6 @@ AnnotationManagerImpl::AnnotationManagerImpl( ViewShellBase& rViewShellBase ) mbShowAnnotations = pOptions->IsShowComments(); } - - void AnnotationManagerImpl::init() { // get current controller and initialize listeners @@ -218,8 +205,6 @@ void AnnotationManagerImpl::init() } } - - // WeakComponentImplHelper1 void SAL_CALL AnnotationManagerImpl::disposing () { @@ -246,8 +231,6 @@ void SAL_CALL AnnotationManagerImpl::disposing () mxCurrentPage.clear(); } - - // XEventListener void SAL_CALL AnnotationManagerImpl::notifyEvent( const ::com::sun::star::document::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) { @@ -276,8 +259,6 @@ void AnnotationManagerImpl::ShowAnnotations( bool bShow ) } } - - void AnnotationManagerImpl::ExecuteAnnotation(SfxRequest& rReq ) { switch( rReq.GetSlot() ) @@ -303,16 +284,12 @@ void AnnotationManagerImpl::ExecuteAnnotation(SfxRequest& rReq ) } } - - void AnnotationManagerImpl::ExecuteInsertAnnotation(SfxRequest& /*rReq*/) { ShowAnnotations(true); InsertAnnotation(); } - - void AnnotationManagerImpl::ExecuteDeleteAnnotation(SfxRequest& rReq) { ShowAnnotations( true ); @@ -360,8 +337,6 @@ void AnnotationManagerImpl::ExecuteDeleteAnnotation(SfxRequest& rReq) UpdateTags(); } - - void AnnotationManagerImpl::InsertAnnotation() { SdPage* pPage = GetCurrentPage(); @@ -439,8 +414,6 @@ void AnnotationManagerImpl::InsertAnnotation() } } - - void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest& rReq ) { Reference< XAnnotation > xAnnotation; @@ -452,7 +425,6 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest& rReq ) ( ( const SfxUnoAnyItem* ) pPoolItem )->GetValue() >>= xAnnotation; } - TextApiObject* pTextApi = getTextApiObject( xAnnotation ); if( pTextApi ) { @@ -506,8 +478,6 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest& rReq ) } } - - void AnnotationManagerImpl::DeleteAnnotation( Reference< XAnnotation > xAnnotation ) { SdPage* pPage = GetCurrentPage(); @@ -584,8 +554,6 @@ void AnnotationManagerImpl::DeleteAllAnnotations() mpDoc->EndUndo(); } - - void AnnotationManagerImpl::GetAnnotationState(SfxItemSet& rSet) { SdPage* pCurrentPage = GetCurrentPage(); @@ -630,8 +598,6 @@ void AnnotationManagerImpl::GetAnnotationState(SfxItemSet& rSet) } } - - void AnnotationManagerImpl::SelectNextAnnotation(bool bForeward) { ShowAnnotations( true ); @@ -739,16 +705,12 @@ void AnnotationManagerImpl::SelectNextAnnotation(bool bForeward) while( true ); } - - void AnnotationManagerImpl::onTagSelected( AnnotationTag& rTag ) { mxSelectedAnnotation = rTag.GetAnnotation(); invalidateSlots(); } - - void AnnotationManagerImpl::onTagDeselected( AnnotationTag& rTag ) { if( rTag.GetAnnotation() == mxSelectedAnnotation ) @@ -758,8 +720,6 @@ void AnnotationManagerImpl::onTagDeselected( AnnotationTag& rTag ) } } - - void AnnotationManagerImpl::SelectAnnotation( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > xAnnotation, bool bEdit /* = sal_False */ ) { mxSelectedAnnotation = xAnnotation; @@ -778,8 +738,6 @@ void AnnotationManagerImpl::SelectAnnotation( ::com::sun::star::uno::Reference< } } - - void AnnotationManagerImpl::GetSelectedAnnotation( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation ) { xAnnotation = mxSelectedAnnotation; @@ -800,8 +758,6 @@ void AnnotationManagerImpl::invalidateSlots() } } - - void AnnotationManagerImpl::onSelectionChanged() { if( mxView.is() && mrBase.GetDrawView() ) try @@ -894,8 +850,6 @@ void AnnotationManagerImpl::CreateTags() } } - - void AnnotationManagerImpl::DisposeTags() { if( !maTagVector.empty() ) @@ -911,8 +865,6 @@ void AnnotationManagerImpl::DisposeTags() } } - - void AnnotationManagerImpl::addListener() { Link aLink( LINK(this,AnnotationManagerImpl,EventMultiplexerListener) ); @@ -924,16 +876,12 @@ void AnnotationManagerImpl::addListener() | tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED); } - - void AnnotationManagerImpl::removeListener() { Link aLink( LINK(this,AnnotationManagerImpl,EventMultiplexerListener) ); mrBase.GetEventMultiplexer()->RemoveEventListener( aLink ); } - - IMPL_LINK(AnnotationManagerImpl,EventMultiplexerListener, tools::EventMultiplexerEvent*,pEvent) { @@ -1088,8 +1036,6 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation } } - - Color AnnotationManagerImpl::GetColor(sal_uInt16 aAuthorIndex) { if (!Application::GetSettings().GetStyleSettings().GetHighContrastMode()) @@ -1203,8 +1149,6 @@ SdPage* AnnotationManagerImpl::GetCurrentPage() return mrBase.GetMainViewShell()->getCurrentPage(); } - - AnnotationManager::AnnotationManager( ViewShellBase& rViewShellBase ) : mxImpl( new AnnotationManagerImpl( rViewShellBase ) ) { diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx index 5636c5d01bf1..8ad5c1659598 100644 --- a/sd/source/ui/annotations/annotationmanagerimpl.hxx +++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx @@ -84,7 +84,6 @@ public: Color GetColorLight(sal_uInt16 aAuthorIndex); Color GetColor(sal_uInt16 aAuthorIndex); - // callbacks void onTagSelected( AnnotationTag& rTag ); void onTagDeselected( AnnotationTag& rTag ); diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx index e460d80efd12..f62c89a0ece8 100644 --- a/sd/source/ui/annotations/annotationtag.cxx +++ b/sd/source/ui/annotations/annotationtag.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/util/XChangesNotifier.hpp> #include <vcl/help.hxx> @@ -59,8 +58,6 @@ namespace sd const sal_uInt32 SMART_TAG_HDL_NUM = SAL_MAX_UINT32; static const int DRGPIX = 2; // Drag MinMove in Pixel - - static OUString getInitials( const OUString& rName ) { OUString sInitials; @@ -93,10 +90,6 @@ static OUString getInitials( const OUString& rName ) return sInitials; } - - - - class AnnotationDragMove : public SdrDragMove { public: @@ -158,8 +151,6 @@ void AnnotationDragMove::CancelSdrDrag() Hide(); } - - class AnnotationHdl : public SmartHdl { public: @@ -170,14 +161,11 @@ public: virtual Pointer GetSdrDragPointer() const; virtual bool isMarkable() const SAL_OVERRIDE; - private: Reference< XAnnotation > mxAnnotation; rtl::Reference< AnnotationTag > mxTag; }; - - AnnotationHdl::AnnotationHdl( const SmartTagReference& xTag, const Reference< XAnnotation >& xAnnotation, const Point& rPnt ) : SmartHdl( xTag, rPnt ) , mxAnnotation( xAnnotation ) @@ -185,14 +173,10 @@ AnnotationHdl::AnnotationHdl( const SmartTagReference& xTag, const Reference< XA { } - - AnnotationHdl::~AnnotationHdl() { } - - void AnnotationHdl::CreateB2dIAObject() { // first throw away old one @@ -255,22 +239,16 @@ void AnnotationHdl::CreateB2dIAObject() } } - - bool AnnotationHdl::IsFocusHdl() const { return true; } - - bool AnnotationHdl::isMarkable() const { return false; } - - Pointer AnnotationHdl::GetSdrDragPointer() const { PointerStyle eStyle = POINTER_NOTALLOWED; @@ -289,8 +267,6 @@ Pointer AnnotationHdl::GetSdrDragPointer() const return Pointer( eStyle ); } - - AnnotationTag::AnnotationTag( AnnotationManagerImpl& rManager, ::sd::View& rView, const Reference< XAnnotation >& xAnnotation, Color& rColor, int nIndex, const Font& rFont ) : SmartTag( rView ) , mrManager( rManager ) @@ -303,16 +279,12 @@ AnnotationTag::AnnotationTag( AnnotationManagerImpl& rManager, ::sd::View& rView { } - - AnnotationTag::~AnnotationTag() { DBG_ASSERT( !mxAnnotation.is(), "sd::AnnotationTag::~AnnotationTag(), dispose me first!" ); Dispose(); } - - /** returns true if the AnnotationTag handled the event. */ bool AnnotationTag::MouseButtonDown( const MouseEvent& rMEvt, SmartHdl& /*rHdl*/ ) { @@ -347,8 +319,6 @@ bool AnnotationTag::MouseButtonDown( const MouseEvent& rMEvt, SmartHdl& /*rHdl*/ return bRet; } - - /** returns true if the SmartTag consumes this event. */ bool AnnotationTag::KeyInput( const KeyEvent& rKEvt ) { @@ -469,51 +439,37 @@ bool AnnotationTag::OnMove( const KeyEvent& rKEvt ) return true; } - - void AnnotationTag::CheckPossibilities() { } - - sal_uLong AnnotationTag::GetMarkablePointCount() const { return 0; } - - sal_uLong AnnotationTag::GetMarkedPointCount() const { return 0; } - - bool AnnotationTag::MarkPoint(SdrHdl& /*rHdl*/, bool /*bUnmark*/ ) { bool bRet=false; return bRet; } - - bool AnnotationTag::MarkPoints(const Rectangle* /*pRect*/, bool /*bUnmark*/ ) { bool bChgd=false; return bChgd; } - - bool AnnotationTag::getContext( SdrViewContext& /*rContext*/ ) { return false; } - - void AnnotationTag::addCustomHandles( SdrHdlList& rHandlerList ) { if( mxAnnotation.is() ) @@ -532,8 +488,6 @@ void AnnotationTag::addCustomHandles( SdrHdlList& rHandlerList ) } } - - void AnnotationTag::disposing() { if( mpListenWindow ) @@ -552,8 +506,6 @@ void AnnotationTag::disposing() SmartTag::disposing(); } - - void AnnotationTag::select() { SmartTag::select(); @@ -571,8 +523,6 @@ void AnnotationTag::select() } } - - void AnnotationTag::deselect() { SmartTag::deselect(); @@ -582,8 +532,6 @@ void AnnotationTag::deselect() mrManager.onTagDeselected( *this ); } - - BitmapEx AnnotationTag::CreateAnnotationBitmap( bool bSelected ) { VirtualDevice aVDev; diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index da5a53847352..7665fbe39d84 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <editeng/fontitem.hxx> #include <editeng/eeitem.hxx> #include <editeng/fhgtitem.hxx> @@ -520,8 +519,6 @@ SvxLanguageItem AnnotationWindow::GetLanguage(void) return SvxLanguageItem( Doc()->GetLanguage( EE_CHAR_LANGUAGE ), SID_ATTR_LANGUAGE ); } - - TextApiObject* getTextApiObject( const Reference< XAnnotation >& xAnnotation ) { if( xAnnotation.is() ) @@ -532,8 +529,6 @@ TextApiObject* getTextApiObject( const Reference< XAnnotation >& xAnnotation ) return 0; } - - void AnnotationWindow::setAnnotation( const Reference< XAnnotation >& xAnnotation, bool bGrabFocus ) { if( (xAnnotation != mxAnnotation) && xAnnotation.is() ) diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx index e53488ee685e..fc692a0944a6 100644 --- a/sd/source/ui/annotations/annotationwindow.hxx +++ b/sd/source/ui/annotations/annotationwindow.hxx @@ -72,7 +72,6 @@ public: virtual void GetFocus() SAL_OVERRIDE; }; - class AnnotationWindow : public FloatingWindow { private: diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx index a6e3dd80bb7a..dca7ba140995 100644 --- a/sd/source/ui/app/optsitem.cxx +++ b/sd/source/ui/app/optsitem.cxx @@ -45,24 +45,18 @@ template< class T > T getSafeValue( const Any& rAny ) return value; } - // - SdOptionsItem - - SdOptionsItem::SdOptionsItem( const SdOptionsGeneric& rParent, const OUString& rSubTree ) : ConfigItem ( rSubTree ), mrParent ( rParent ) { } - - SdOptionsItem::~SdOptionsItem() { } - - void SdOptionsItem::Commit() { if( IsModified() ) @@ -72,29 +66,21 @@ void SdOptionsItem::Commit() void SdOptionsItem::Notify( const com::sun::star::uno::Sequence<OUString>& ) {} - - - Sequence< Any > SdOptionsItem::GetProperties( const Sequence< OUString >& rNames ) { return ConfigItem::GetProperties( rNames ); } - - bool SdOptionsItem::PutProperties( const Sequence< OUString >& rNames, const Sequence< Any>& rValues ) { return ConfigItem::PutProperties( rNames, rValues ); } - - void SdOptionsItem::SetModified() { ConfigItem::SetModified(); } - // - SdOptionsGeneric - SdOptionsGeneric::SdOptionsGeneric(sal_uInt16 nConfigId, const OUString& rSubTree) : maSubTree(rSubTree) @@ -130,16 +116,12 @@ void SdOptionsGeneric::Init() const } } - - SdOptionsGeneric::~SdOptionsGeneric() { delete mpCfgItem; mpCfgItem = NULL; } - - void SdOptionsGeneric::Commit( SdOptionsItem& rCfgItem ) const { const Sequence< OUString > aNames( GetPropertyNames() ); @@ -156,8 +138,6 @@ void SdOptionsGeneric::Commit( SdOptionsItem& rCfgItem ) const } } - - Sequence< OUString > SdOptionsGeneric::GetPropertyNames() const { sal_uLong nCount; @@ -174,16 +154,12 @@ Sequence< OUString > SdOptionsGeneric::GetPropertyNames() const return aNames; } - - void SdOptionsGeneric::Store() { if( mpCfgItem ) mpCfgItem->Commit(); } - - bool SdOptionsGeneric::isMetricSystem() { SvtSysLocale aSysLocale; @@ -215,8 +191,6 @@ SdOptionsLayout::SdOptionsLayout( sal_uInt16 nConfigId, bool bUseConfig ) : EnableModify( true ); } - - bool SdOptionsLayout::operator==( const SdOptionsLayout& rOpt ) const { return( IsRulerVisible() == rOpt.IsRulerVisible() && @@ -228,8 +202,6 @@ bool SdOptionsLayout::operator==( const SdOptionsLayout& rOpt ) const GetDefTab() == rOpt.GetDefTab() ); } - - void SdOptionsLayout::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const { if( isMetricSystem() ) @@ -264,8 +236,6 @@ void SdOptionsLayout::GetPropNameArray( const char**& ppNames, sal_uLong& rCount } } - - bool SdOptionsLayout::ReadData( const Any* pValues ) { if( pValues[0].hasValue() ) SetRulerVisible( *(sal_Bool*) pValues[ 0 ].getValue() ); @@ -279,8 +249,6 @@ bool SdOptionsLayout::ReadData( const Any* pValues ) return true; } - - bool SdOptionsLayout::WriteData( Any* pValues ) const { pValues[ 0 ] <<= IsRulerVisible(); @@ -306,8 +274,6 @@ SdOptionsLayoutItem::SdOptionsLayoutItem( sal_uInt16 _nWhich ) { } - - SdOptionsLayoutItem::SdOptionsLayoutItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd::FrameView* pView ) : SfxPoolItem ( _nWhich ) , maOptionsLayout ( 0, false ) @@ -336,16 +302,11 @@ SdOptionsLayoutItem::SdOptionsLayoutItem( sal_uInt16 _nWhich, SdOptions* pOpts, } } - - SfxPoolItem* SdOptionsLayoutItem::Clone( SfxItemPool* ) const { return new SdOptionsLayoutItem( *this ); } - - - bool SdOptionsLayoutItem::operator==( const SfxPoolItem& rAttr ) const { const bool bSameType = SfxPoolItem::operator==( rAttr ); @@ -353,8 +314,6 @@ bool SdOptionsLayoutItem::operator==( const SfxPoolItem& rAttr ) const return bSameType && ( maOptionsLayout == static_cast< const SdOptionsLayoutItem& >( rAttr ).maOptionsLayout ); } - - void SdOptionsLayoutItem::SetOptions( SdOptions* pOpts ) const { if( pOpts ) @@ -385,15 +344,11 @@ SdOptionsContents::SdOptionsContents( sal_uInt16 nConfigId, bool bUseConfig ) : EnableModify( true ); } - - bool SdOptionsContents::operator==(const SdOptionsContents&) const { return true; } - - void SdOptionsContents::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const { static const char* aPropNames[] = @@ -408,15 +363,11 @@ void SdOptionsContents::GetPropNameArray( const char**& ppNames, sal_uLong& rCou ppNames = aPropNames; } - - bool SdOptionsContents::ReadData(const Any*) { return true; } - - bool SdOptionsContents::WriteData( Any* pValues ) const { //#i80528# no draft anymore @@ -440,15 +391,11 @@ SdOptionsContentsItem::SdOptionsContentsItem(sal_uInt16 _nWhich, SdOptions*, ::s { } - - SfxPoolItem* SdOptionsContentsItem::Clone( SfxItemPool* ) const { return new SdOptionsContentsItem( *this ); } - - bool SdOptionsContentsItem::operator==( const SfxPoolItem& rAttr ) const { const bool bSameType = SfxPoolItem::operator==(rAttr); @@ -456,8 +403,6 @@ bool SdOptionsContentsItem::operator==( const SfxPoolItem& rAttr ) const return bSameType && ( maOptionsContents == static_cast<const SdOptionsContentsItem&>( rAttr ).maOptionsContents ); } - - void SdOptionsContentsItem::SetOptions(SdOptions*) const { } @@ -507,8 +452,6 @@ SdOptionsMisc::SdOptionsMisc( sal_uInt16 nConfigId, bool bUseConfig ) : EnableModify( true ); } - - bool SdOptionsMisc::operator==( const SdOptionsMisc& rOpt ) const { return( IsStartWithTemplate() == rOpt.IsStartWithTemplate() && @@ -541,8 +484,6 @@ bool SdOptionsMisc::operator==( const SdOptionsMisc& rOpt ) const ); } - - void SdOptionsMisc::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const { static const char* aPropNames[] = @@ -586,8 +527,6 @@ void SdOptionsMisc::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) ppNames = aPropNames; } - - bool SdOptionsMisc::ReadData( const Any* pValues ) { if( pValues[0].hasValue() ) SetMarkedHitMovesAlways( *(sal_Bool*) pValues[ 0 ].getValue() ); @@ -647,8 +586,6 @@ bool SdOptionsMisc::ReadData( const Any* pValues ) return true; } - - bool SdOptionsMisc::WriteData( Any* pValues ) const { pValues[ 0 ] <<= IsMarkedHitMovesAlways(); @@ -702,8 +639,6 @@ SdOptionsMiscItem::SdOptionsMiscItem( sal_uInt16 _nWhich ) { } - - SdOptionsMiscItem::SdOptionsMiscItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd::FrameView* pView ) : SfxPoolItem ( _nWhich ) , maOptionsMisc ( 0, false ) @@ -761,16 +696,11 @@ SdOptionsMiscItem::SdOptionsMiscItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd } } - - SfxPoolItem* SdOptionsMiscItem::Clone( SfxItemPool* ) const { return new SdOptionsMiscItem( *this ); } - - - bool SdOptionsMiscItem::operator==( const SfxPoolItem& rAttr ) const { const bool bSameType = SfxPoolItem::operator==(rAttr); @@ -778,8 +708,6 @@ bool SdOptionsMiscItem::operator==( const SfxPoolItem& rAttr ) const return bSameType && ( maOptionsMisc == static_cast< const SdOptionsMiscItem& >(rAttr).maOptionsMisc ); } - - void SdOptionsMiscItem::SetOptions( SdOptions* pOpts ) const { if( pOpts ) @@ -842,8 +770,6 @@ SdOptionsSnap::SdOptionsSnap( sal_uInt16 nConfigId, bool bUseConfig ) : EnableModify( true ); } - - bool SdOptionsSnap::operator==( const SdOptionsSnap& rOpt ) const { return( IsSnapHelplines() == rOpt.IsSnapHelplines() && @@ -858,8 +784,6 @@ bool SdOptionsSnap::operator==( const SdOptionsSnap& rOpt ) const GetEliminatePolyPointLimitAngle() == rOpt.GetEliminatePolyPointLimitAngle() ); } - - void SdOptionsSnap::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const { static const char* aPropNames[] = @@ -880,8 +804,6 @@ void SdOptionsSnap::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) ppNames = aPropNames; } - - bool SdOptionsSnap::ReadData( const Any* pValues ) { if( pValues[0].hasValue() ) SetSnapHelplines( *(sal_Bool*) pValues[ 0 ].getValue() ); @@ -898,8 +820,6 @@ bool SdOptionsSnap::ReadData( const Any* pValues ) return true; } - - bool SdOptionsSnap::WriteData( Any* pValues ) const { pValues[ 0 ] <<= IsSnapHelplines(); @@ -928,8 +848,6 @@ SdOptionsSnapItem::SdOptionsSnapItem( sal_uInt16 _nWhich ) { } - - SdOptionsSnapItem::SdOptionsSnapItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd::FrameView* pView ) : SfxPoolItem ( _nWhich ) , maOptionsSnap ( 0, false ) @@ -962,16 +880,11 @@ SdOptionsSnapItem::SdOptionsSnapItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd } } - - SfxPoolItem* SdOptionsSnapItem::Clone( SfxItemPool* ) const { return new SdOptionsSnapItem( *this ); } - - - bool SdOptionsSnapItem::operator==( const SfxPoolItem& rAttr ) const { const bool bSameType = SfxPoolItem::operator==(rAttr); @@ -979,8 +892,6 @@ bool SdOptionsSnapItem::operator==( const SfxPoolItem& rAttr ) const return bSameType && ( maOptionsSnap == static_cast< const SdOptionsSnapItem& >(rAttr).maOptionsSnap ); } - - void SdOptionsSnapItem::SetOptions( SdOptions* pOpts ) const { if( pOpts ) @@ -1015,8 +926,6 @@ SdOptionsZoom::SdOptionsZoom( sal_uInt16 nConfigId, bool bUseConfig ) : EnableModify( true ); } - - bool SdOptionsZoom::operator==( const SdOptionsZoom& rOpt ) const { sal_Int32 nX1, nX2, nY1, nY2; @@ -1028,8 +937,6 @@ bool SdOptionsZoom::operator==( const SdOptionsZoom& rOpt ) const ( nY1 == nY2 ) ); } - - void SdOptionsZoom::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const { static const char* aPropNames[] = @@ -1042,8 +949,6 @@ void SdOptionsZoom::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) ppNames = aPropNames; } - - bool SdOptionsZoom::ReadData( const Any* pValues ) { sal_Int32 x = 1, y = 1; @@ -1056,8 +961,6 @@ bool SdOptionsZoom::ReadData( const Any* pValues ) return true; } - - bool SdOptionsZoom::WriteData( Any* pValues ) const { sal_Int32 x, y; @@ -1088,14 +991,10 @@ SdOptionsGrid::SdOptionsGrid( sal_uInt16 nConfigId, bool bUseConfig ) : EnableModify( true ); } - - SdOptionsGrid::~SdOptionsGrid() { } - - void SdOptionsGrid::SetDefaults() { const sal_uInt32 nVal = 1000; @@ -1112,8 +1011,6 @@ void SdOptionsGrid::SetDefaults() SetEqualGrid( true ); } - - bool SdOptionsGrid::operator==( const SdOptionsGrid& rOpt ) const { return( GetFldDrawX() == rOpt.GetFldDrawX() && @@ -1128,8 +1025,6 @@ bool SdOptionsGrid::operator==( const SdOptionsGrid& rOpt ) const IsEqualGrid() == rOpt.IsEqualGrid() ); } - - void SdOptionsGrid::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const { if( isMetricSystem() ) @@ -1170,8 +1065,6 @@ void SdOptionsGrid::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) } } - - bool SdOptionsGrid::ReadData( const Any* pValues ) { if( pValues[0].hasValue() ) SetFldDrawX( *(sal_Int32*) pValues[ 0 ].getValue() ); @@ -1199,8 +1092,6 @@ bool SdOptionsGrid::ReadData( const Any* pValues ) return true; } - - bool SdOptionsGrid::WriteData( Any* pValues ) const { pValues[ 0 ] <<= (sal_Int32) GetFldDrawX(); @@ -1253,8 +1144,6 @@ SdOptionsGridItem::SdOptionsGridItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd } } - - void SdOptionsGridItem::SetOptions( SdOptions* pOpts ) const { pOpts->SetFldDrawX( GetFldDrawX() ); @@ -1306,8 +1195,6 @@ SdOptionsPrint::SdOptionsPrint( sal_uInt16 nConfigId, bool bUseConfig ) : EnableModify( true ); } - - bool SdOptionsPrint::operator==( const SdOptionsPrint& rOpt ) const { return( IsDraw() == rOpt.IsDraw() && @@ -1333,8 +1220,6 @@ bool SdOptionsPrint::operator==( const SdOptionsPrint& rOpt ) const GetHandoutPages() == rOpt.GetHandoutPages() ); } - - void SdOptionsPrint::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const { if( GetConfigId() == SDCFG_IMPRESS ) @@ -1392,8 +1277,6 @@ void SdOptionsPrint::GetPropNameArray( const char**& ppNames, sal_uLong& rCount } } - - bool SdOptionsPrint::ReadData( const Any* pValues ) { if( pValues[0].hasValue() ) SetDate( *(sal_Bool*) pValues[ 0 ].getValue() ); @@ -1422,8 +1305,6 @@ bool SdOptionsPrint::ReadData( const Any* pValues ) return true; } - - bool SdOptionsPrint::WriteData( Any* pValues ) const { pValues[ 0 ] <<= IsDate(); @@ -1464,8 +1345,6 @@ SdOptionsPrintItem::SdOptionsPrintItem( sal_uInt16 _nWhich ) { } - - SdOptionsPrintItem::SdOptionsPrintItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd::FrameView* ) : SfxPoolItem ( _nWhich ) , maOptionsPrint ( 0, false ) @@ -1494,15 +1373,11 @@ SdOptionsPrintItem::SdOptionsPrintItem( sal_uInt16 _nWhich, SdOptions* pOpts, :: } } - - SfxPoolItem* SdOptionsPrintItem::Clone( SfxItemPool* ) const { return new SdOptionsPrintItem( *this ); } - - bool SdOptionsPrintItem::operator==( const SfxPoolItem& rAttr ) const { const bool bSameType = SfxPoolItem::operator==(rAttr); @@ -1510,8 +1385,6 @@ bool SdOptionsPrintItem::operator==( const SfxPoolItem& rAttr ) const return bSameType && ( maOptionsPrint == static_cast< const SdOptionsPrintItem& >( rAttr ).maOptionsPrint ); } - - void SdOptionsPrintItem::SetOptions( SdOptions* pOpts ) const { if( pOpts ) @@ -1555,14 +1428,10 @@ SdOptions::SdOptions( sal_uInt16 nConfigId ) : { } - - SdOptions::~SdOptions() { } - - void SdOptions::StoreConfig( sal_uLong nOptionsRange ) { if( nOptionsRange & SD_OPTIONS_LAYOUT ) diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index b3392e6ba665..871bbc06b6ad 100644 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -226,7 +226,6 @@ SvNumberFormatter* SdModule::GetNumberFormatter() return pNumberFormatter; } - /** This method is deprecated and only an alias to * <member>GetVirtualRefDevice()</member>. The given argument is ignored. */ diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index f6f453c9699d..a10cbf31a868 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <svl/lckbitem.hxx> #include <sfx2/frame.hxx> #include <sfx2/viewfrm.hxx> @@ -67,7 +66,6 @@ #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> #include <com/sun/star/document/XDocumentProperties.hpp> - using ::sd::framework::FrameworkHelper; using ::com::sun::star::uno::Reference; using ::com::sun::star::frame::XFrame; @@ -90,10 +88,8 @@ private: ::boost::shared_ptr<SvMemoryStream> mpStream; }; - } //end of anonymous namespace - void SdModule::Execute(SfxRequest& rReq) { const SfxItemSet* pSet = rReq.GetArgs(); @@ -256,7 +252,6 @@ void SdModule::Execute(SfxRequest& rReq) } } - void SdModule::OutlineToImpress (SfxRequest& rRequest) { const SfxItemSet* pSet = rRequest.GetArgs(); @@ -320,7 +315,6 @@ void SdModule::OutlineToImpress (SfxRequest& rRequest) rRequest.IsDone(); } - static bool bOnce = false; void SdModule::GetState(SfxItemSet& rItemSet) @@ -458,7 +452,6 @@ IMPL_LINK( SdModule, EventListenerHdl, VclSimpleEvent*, pEvent ) return 0; } - void SdModule::AddSummaryPage (SfxViewFrame* pViewFrame, SdDrawDocument* pDocument) { if( !pViewFrame || !pViewFrame->GetDispatcher() || !pDocument ) @@ -908,9 +901,6 @@ void SdModule::ChangeMedium( ::sd::DrawDocShell* pDocShell, SfxViewFrame* pViewF } } - - - //===== OutlineToImpressFinalize ============================================== namespace { @@ -979,9 +969,6 @@ OutlineToImpressFinalizer::OutlineToImpressFinalizer ( } } - - - void OutlineToImpressFinalizer::operator() (bool) { // Fetch the new outline view shell. @@ -1015,7 +1002,6 @@ void OutlineToImpressFinalizer::operator() (bool) pOutlineShell->UpdatePreview(pPage, true); } - // Undo-Stack needs to be cleared, else the user may remove the // only drawpage and this is a state we cannot handle ATM. ::sd::DrawDocShell* pDocShell = mrDocument.GetDocSh(); @@ -1023,7 +1009,6 @@ void OutlineToImpressFinalizer::operator() (bool) pDocShell->ClearUndoBuffer(); } - } // end of anonymous namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index 407132f4a369..6ef224f1a3fc 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -41,7 +41,6 @@ #include <sfx2/sfxdlg.hxx> - #include <svx/sdr/contact/displayinfo.hxx> #include "sdmod.hxx" @@ -375,7 +374,6 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo) return(0); } - /** * virtual methods for option dialog */ @@ -461,7 +459,6 @@ SfxItemSet* SdModule::CreateItemSet( sal_uInt16 nSlot ) } pRet->Put( aSdOptionsMiscItem ); - // TP_OPTIONS_SNAP: pRet->Put( SdOptionsSnapItem( ATTR_OPTIONS_SNAP, pOptions, pFrameView ) ); @@ -495,7 +492,6 @@ SfxItemSet* SdModule::CreateItemSet( sal_uInt16 nSlot ) pRet->Put( SfxUInt32Item( ATTR_OPTIONS_SCALE_WIDTH, nW ) ); pRet->Put( SfxUInt32Item( ATTR_OPTIONS_SCALE_HEIGHT, nH ) ); - // TP_OPTIONS_PRINT: pRet->Put( SdOptionsPrintItem( ATTR_OPTIONS_PRINT, pOptions ) ); diff --git a/sd/source/ui/app/sdpopup.cxx b/sd/source/ui/app/sdpopup.cxx index 880bd3132ec1..5f77891592cb 100644 --- a/sd/source/ui/app/sdpopup.cxx +++ b/sd/source/ui/app/sdpopup.cxx @@ -305,5 +305,4 @@ SvxFieldData* SdFieldPopup::GetField() return( pNewField ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/app/sdresid.cxx b/sd/source/ui/app/sdresid.cxx index f8df3db71c59..c91e982a0b7c 100644 --- a/sd/source/ui/app/sdresid.cxx +++ b/sd/source/ui/app/sdresid.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "sdmod.hxx" #include "sdresid.hxx" #include <sal/types.h> @@ -28,5 +27,4 @@ SdResId::SdResId(sal_uInt16 nId) : { } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index 08acf398b9e6..1e5c8872b76c 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -737,8 +737,6 @@ sal_Int64 SAL_CALL SdTransferable::getSomething( const ::com::sun::star::uno::Se return nRet; } - - void SdTransferable::AddUserData (const ::boost::shared_ptr<UserData>& rpData) { maUserData.push_back(rpData); diff --git a/sd/source/ui/app/tbxww.cxx b/sd/source/ui/app/tbxww.cxx index a736f881ed94..5a7b12e02ba3 100644 --- a/sd/source/ui/app/tbxww.cxx +++ b/sd/source/ui/app/tbxww.cxx @@ -310,6 +310,4 @@ bool SdTbxControl::IsCheckable( sal_uInt16 nSId ) return false; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/app/tmplctrl.cxx b/sd/source/ui/app/tmplctrl.cxx index ef6fdf25bf28..984a8752971d 100644 --- a/sd/source/ui/app/tmplctrl.cxx +++ b/sd/source/ui/app/tmplctrl.cxx @@ -46,16 +46,12 @@ private: virtual void Select() SAL_OVERRIDE; }; - - SdTemplatePopup_Impl::SdTemplatePopup_Impl() : PopupMenu(), nCurId(USHRT_MAX) { } - - void SdTemplatePopup_Impl::Select() { nCurId = GetCurItemId(); @@ -70,14 +66,10 @@ SdTemplateControl::SdTemplateControl( sal_uInt16 _nSlotId, { } - - SdTemplateControl::~SdTemplateControl() { } - - void SdTemplateControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState ) { @@ -90,15 +82,11 @@ void SdTemplateControl::StateChanged( } } - - void SdTemplateControl::Paint( const UserDrawEvent& ) { GetStatusBar().SetItemText( GetId(), msTemplate ); } - - void SdTemplateControl::Command( const CommandEvent& rCEvt ) { if ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU && !GetStatusBar().GetItemText( GetId() ).isEmpty() ) @@ -142,6 +130,4 @@ void SdTemplateControl::Command( const CommandEvent& rCEvt ) } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index 34a5e2b69412..5c199a302a10 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/text/WritingMode.hpp> #include <com/sun/star/frame/status/FontHeight.hpp> @@ -52,7 +51,6 @@ #include "pres.hxx" #include "slidelayoutcontroller.hxx" - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -66,8 +64,6 @@ namespace sd extern OUString ImplRetrieveLabelFromCommand( const Reference< XFrame >& xFrame, const OUString& aCmdURL ); - - class LayoutToolbarMenu : public svtools::ToolbarMenu { public: @@ -85,8 +81,6 @@ private: ValueSet* mpLayoutSet2; }; - - struct snewfoil_value_info { sal_uInt16 mnBmpResId; @@ -139,8 +133,6 @@ static const snewfoil_value_info v_standard[] = {0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE} }; - - static void fillLayoutValueSet( ValueSet* pValue, const snewfoil_value_info* pInfo ) { Size aLayoutItemSize; @@ -160,8 +152,6 @@ static void fillLayoutValueSet( ValueSet* pValue, const snewfoil_value_info* pIn pValue->SetSizePixel( pValue->CalcWindowSizePixel( aLayoutItemSize ) ); } - - LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const Reference< XFrame >& xFrame, ::Window* pParent, const bool bInsertPage ) : svtools::ToolbarMenu(xFrame, pParent, WB_CLIPCHILDREN ) , mrController( rController ) @@ -266,14 +256,10 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const SetOutputSizePixel( getMenuSize() ); } - - LayoutToolbarMenu::~LayoutToolbarMenu() { } - - IMPL_LINK( LayoutToolbarMenu, SelectHdl, void *, pControl ) { if ( IsInPopupMode() ) @@ -310,15 +296,11 @@ IMPL_LINK( LayoutToolbarMenu, SelectHdl, void *, pControl ) return 0; } - - OUString SlideLayoutController_getImplementationName() throw (css::uno::RuntimeException) { return OUString( "com.sun.star.comp.sd.SlideLayoutController" ); } - - Sequence< OUString > SlideLayoutController_getSupportedServiceNames() throw( RuntimeException ) { Sequence< OUString > aSNS( 1 ); @@ -326,23 +308,17 @@ Sequence< OUString > SlideLayoutController_getSupportedServiceNames() throw( Ru return aSNS; } - - Reference< XInterface > SAL_CALL SlideLayoutController_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) { return static_cast< cppu::OWeakObject * >( new SlideLayoutController( comphelper::getComponentContext(rSMgr), ".uno:AssignLayout", false )); } - - OUString InsertSlideController_getImplementationName() throw (css::uno::RuntimeException) { return OUString( "com.sun.star.comp.sd.InsertSlideController" ); } - - Sequence< OUString > InsertSlideController_getSupportedServiceNames() throw( RuntimeException ) { Sequence< OUString > aSNS( 1 ); @@ -350,35 +326,27 @@ Sequence< OUString > InsertSlideController_getSupportedServiceNames() throw( Ru return aSNS; } - - Reference< XInterface > SAL_CALL InsertSlideController_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) { return static_cast< cppu::OWeakObject * >( new SlideLayoutController( comphelper::getComponentContext(rSMgr), ".uno:InsertPage" , true ) ); } - // class SlideLayoutController - SlideLayoutController::SlideLayoutController( const Reference< uno::XComponentContext >& rxContext, const OUString& sCommandURL, bool bInsertPage ) : svt::PopupWindowController( rxContext, Reference< frame::XFrame >(), sCommandURL ) , mbInsertPage( bInsertPage ) { } - - ::Window* SlideLayoutController::createPopupWindow( ::Window* pParent ) { return new sd::LayoutToolbarMenu( *this, m_xFrame, pParent, mbInsertPage ); } - // XServiceInfo - OUString SAL_CALL SlideLayoutController::getImplementationName() throw( RuntimeException, std::exception ) { if( mbInsertPage ) @@ -387,8 +355,6 @@ OUString SAL_CALL SlideLayoutController::getImplementationName() throw( RuntimeE return SlideLayoutController_getImplementationName(); } - - Sequence< OUString > SAL_CALL SlideLayoutController::getSupportedServiceNames( ) throw( RuntimeException, std::exception ) { if( mbInsertPage ) diff --git a/sd/source/ui/dlg/AnimationChildWindow.cxx b/sd/source/ui/dlg/AnimationChildWindow.cxx index a9c8acb90bd1..abe028c04a1b 100644 --- a/sd/source/ui/dlg/AnimationChildWindow.cxx +++ b/sd/source/ui/dlg/AnimationChildWindow.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "AnimationChildWindow.hxx" #include "app.hrc" diff --git a/sd/source/ui/dlg/LayerDialogChildWindow.cxx b/sd/source/ui/dlg/LayerDialogChildWindow.cxx index d88b0b621a69..2f4050b759b0 100644 --- a/sd/source/ui/dlg/LayerDialogChildWindow.cxx +++ b/sd/source/ui/dlg/LayerDialogChildWindow.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "LayerDialogChildWindow.hxx" #include <sfx2/dockwin.hxx> #include "app.hrc" @@ -33,14 +32,12 @@ SFX_IMPL_DOCKINGWINDOW_WITHID(LayerDialogChildWindow, SID_LAYER_DIALOG_WIN) #include "LayerDialog.hrc" #include "LayerDialogContent.hxx" - #include "ViewShellBase.hxx" #include "DrawViewShell.hxx" #include <sfx2/dispatch.hxx> namespace sd { - LayerDialogChildWindow::LayerDialogChildWindow ( ::Window* _pParent, sal_uInt16 nId, @@ -63,14 +60,10 @@ LayerDialogChildWindow::LayerDialogChildWindow ( pContent->Initialize(pInfo); } - - LayerDialogChildWindow::~LayerDialogChildWindow (void) { } - - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/dlg/LayerDialogContent.cxx b/sd/source/ui/dlg/LayerDialogContent.cxx index 0e43d289f574..2a361ec01768 100644 --- a/sd/source/ui/dlg/LayerDialogContent.cxx +++ b/sd/source/ui/dlg/LayerDialogContent.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "LayerDialogContent.hxx" #include <com/sun/star/presentation/AnimationEffect.hpp> #include <com/sun/star/presentation/AnimationSpeed.hpp> @@ -45,8 +44,6 @@ using namespace ::com::sun::star; namespace sd { - - LayerDialogContent::LayerDialogContent ( SfxBindings* pInBindings, SfxChildWindow *pCW, @@ -66,24 +63,15 @@ LayerDialogContent::LayerDialogContent ( maLayerTabBar.Show(); } - - - LayerDialogContent::~LayerDialogContent (void) { } - - - bool LayerDialogContent::Close (void) { return SfxDockingWindow::Close(); } - - - void LayerDialogContent::Resize (void) { maLayerTabBar.SetPosSizePixel ( @@ -92,7 +80,6 @@ void LayerDialogContent::Resize (void) SfxDockingWindow::Resize(); } - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx index fa1406695333..65ade494de6d 100644 --- a/sd/source/ui/dlg/LayerTabBar.cxx +++ b/sd/source/ui/dlg/LayerTabBar.cxx @@ -17,14 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "LayerTabBar.hxx" #include <svx/svdlayer.hxx> #include <svx/svdpagv.hxx> #include <vcl/msgbox.hxx> #include <sfx2/dispatch.hxx> - #include "sdattr.hxx" #include "sdmod.hxx" #include "helpids.h" @@ -41,7 +39,6 @@ #include "drawview.hxx" #include "undolayer.hxx" - namespace sd { /** @@ -58,7 +55,6 @@ LayerTabBar::LayerTabBar(DrawViewShell* pViewSh, Window* pParent) SetHelpId( HID_SD_TABBAR_LAYERS ); } - LayerTabBar::LayerTabBar ( DrawViewShell* pViewSh, Window* pParent, @@ -122,7 +118,6 @@ void LayerTabBar::DoubleClick() } } - /** * AcceptDrop-Event */ @@ -303,18 +298,12 @@ void LayerTabBar::ActivatePage() } } - - - void LayerTabBar::SendActivatePageEvent (void) { CallEventListeners (VCLEVENT_TABBAR_PAGEACTIVATED, reinterpret_cast<void*>(GetCurPageId())); } - - - void LayerTabBar::SendDeactivatePageEvent (void) { CallEventListeners (VCLEVENT_TABBAR_PAGEDEACTIVATED, diff --git a/sd/source/ui/dlg/NavigatorChildWindow.cxx b/sd/source/ui/dlg/NavigatorChildWindow.cxx index 47e3e7afa72d..9145f0c3436b 100644 --- a/sd/source/ui/dlg/NavigatorChildWindow.cxx +++ b/sd/source/ui/dlg/NavigatorChildWindow.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "NavigatorChildWindow.hxx" #include "navigatr.hxx" #include "app.hrc" @@ -28,7 +27,6 @@ #include <svl/eitem.hxx> #include <boost/bind.hpp> - namespace sd { SFX_IMPL_CHILDWINDOWCONTEXT(NavigatorChildWindow, SID_NAVIGATOR) @@ -47,7 +45,6 @@ void RequestNavigatorUpdate (SfxBindings* pBindings) } } - NavigatorChildWindow::NavigatorChildWindow ( ::Window* pParent, sal_uInt16 nId, diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx b/sd/source/ui/dlg/PaneChildWindows.cxx index 89a9f96936ec..e113db903c33 100644 --- a/sd/source/ui/dlg/PaneChildWindows.cxx +++ b/sd/source/ui/dlg/PaneChildWindows.cxx @@ -76,9 +76,6 @@ PaneChildWindow::PaneChildWindow ( } } - - - PaneChildWindow::~PaneChildWindow (void) { ViewShellBase* pBase = NULL; @@ -90,11 +87,6 @@ PaneChildWindow::~PaneChildWindow (void) framework::FrameworkHelper::Instance(*pBase)->UpdateConfiguration(); } - - - - - //===== LeftPaneImpressChildWindow ============================================ LeftPaneImpressChildWindow::LeftPaneImpressChildWindow ( @@ -113,9 +105,6 @@ LeftPaneImpressChildWindow::LeftPaneImpressChildWindow ( { } - - - //===== LeftPaneDrawChildWindow =============================================== LeftPaneDrawChildWindow::LeftPaneDrawChildWindow ( diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx b/sd/source/ui/dlg/PaneDockingWindow.cxx index 9136af906e1f..4c960db514eb 100644 --- a/sd/source/ui/dlg/PaneDockingWindow.cxx +++ b/sd/source/ui/dlg/PaneDockingWindow.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "PaneDockingWindow.hxx" #include "Window.hxx" #include "ViewShellBase.hxx" @@ -91,13 +90,6 @@ void PaneDockingWindow::MouseButtonDown (const MouseEvent& rEvent) SfxDockingWindow::MouseButtonDown(rEvent); } - - - - - - - void PaneDockingWindow::SetValidSizeRange (const Range aValidSizeRange) { SplitWindow* pSplitWindow = dynamic_cast<SplitWindow*>(GetParent()); @@ -119,9 +111,6 @@ void PaneDockingWindow::SetValidSizeRange (const Range aValidSizeRange) } } - - - PaneDockingWindow::Orientation PaneDockingWindow::GetOrientation (void) const { SplitWindow* pSplitWindow = dynamic_cast<SplitWindow*>(GetParent()); diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx index 3e9c5e7d7669..eb2ee3ba6b4c 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx @@ -125,7 +125,6 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl) Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY ); xProps->setPropertyValue("Graphic", ::uno::Any(xGraphic)); - ::awt::Size aPageSize; xSlideProps->getPropertyValue( @@ -396,7 +395,6 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl) aPicPos.X = (aPageSize.Width/4 - aPicSize.Width/2); aPicPos.Y = aPageSize.Height/4 - aPicSize.Height/2 + aPageSize.Height/2; - xShape->setPosition(aPicPos); xSlide->add(xShape); } @@ -678,7 +676,6 @@ void SdPhotoAlbumDialog::EnableDisableButtons() pImagesLst->GetSelectEntryPos() < pImagesLst->GetEntryCount()-1); } - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx index 9e3fa3882dba..4d356bcfc971 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx @@ -34,7 +34,6 @@ using namespace ::com::sun::star; namespace sd { - // struct ClientBoxEntry ClientBoxEntry::ClientBoxEntry( ClientInfo* pClientInfo ) : @@ -43,12 +42,9 @@ ClientBoxEntry::ClientBoxEntry( ClientInfo* pClientInfo ) : { } - ClientBoxEntry::~ClientBoxEntry() {} - - // ClientRemovedListener void ClientRemovedListener::disposing( lang::EventObject const & rEvt ) @@ -57,12 +53,10 @@ void ClientRemovedListener::disposing( lang::EventObject const & rEvt ) (void) rEvt; } - ClientRemovedListener::~ClientRemovedListener() { } - // ClientBox ClientBox::ClientBox( Window* pParent, WinBits nStyle ) : @@ -126,7 +120,6 @@ Size ClientBox::GetOptimalSize() const return LogicToPixel(Size(200, 140), MAP_APPFONT); } - ClientBox::~ClientBox() { if ( ! m_bInDelete ) @@ -146,7 +139,6 @@ ClientBox::~ClientBox() m_xRemoveListener.clear(); } - // Title + description void ClientBox::CalcActiveHeight( const long nPos ) { @@ -179,7 +171,6 @@ void ClientBox::CalcActiveHeight( const long nPos ) m_nActiveHeight = aTextHeight + 2; } - Rectangle ClientBox::GetEntryRect( const long nPos ) const { const ::osl::MutexGuard aGuard( m_entriesMutex ); @@ -201,7 +192,6 @@ Rectangle ClientBox::GetEntryRect( const long nPos ) const return Rectangle( aPos, aSize ); } - void ClientBox::DeleteRemoved() { const ::osl::MutexGuard aGuard( m_entriesMutex ); @@ -224,7 +214,6 @@ long ClientBox::GetActiveEntryIndex() return -1; } - //This function may be called with nPos < 0 void ClientBox::selectEntry( const long nPos ) { @@ -269,7 +258,6 @@ void ClientBox::selectEntry( const long nPos ) guard.clear(); } - void ClientBox::DrawRow( const Rectangle& rRect, const TClientBoxEntry pEntry ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); @@ -357,10 +345,6 @@ void ClientBox::DrawRow( const Rectangle& rRect, const TClientBoxEntry pEntry ) m_aPinBox.SetPosPixel( aBtnPos ); - - - - // long nExtraHeight = 0; // if ( pEntry->m_bHasButtons ) @@ -377,7 +361,6 @@ void ClientBox::DrawRow( const Rectangle& rRect, const TClientBoxEntry pEntry ) DrawLine( rRect.BottomLeft(), rRect.BottomRight() ); } - void ClientBox::RecalcAll() { if ( m_bHasActive ) @@ -428,13 +411,11 @@ void ClientBox::RecalcAll() m_bNeedsRecalc = false; } - bool ClientBox::HandleTabKey( bool ) { return false; } - bool ClientBox::HandleCursorKey( sal_uInt16 nKeyCode ) { if ( m_vEntries.empty() ) @@ -479,7 +460,6 @@ bool ClientBox::HandleCursorKey( sal_uInt16 nKeyCode ) return true; } - void ClientBox::Paint( const Rectangle &/*rPaintRect*/ ) { if ( !m_bInDelete ) @@ -506,7 +486,6 @@ void ClientBox::Paint( const Rectangle &/*rPaintRect*/ ) } } - long ClientBox::GetTotalHeight() const { long nHeight = m_vEntries.size() * m_nStdHeight; @@ -519,7 +498,6 @@ long ClientBox::GetTotalHeight() const return nHeight; } - void ClientBox::SetupScrollBar() { const Size aSize = GetOutputSizePixel(); @@ -552,13 +530,11 @@ void ClientBox::SetupScrollBar() m_bHasScrollBar = bNeedsScrollBar; } - void ClientBox::Resize() { RecalcAll(); } - long ClientBox::PointToPos( const Point& rPos ) { long nPos = ( rPos.Y() + m_nTopIndex ) / m_nStdHeight; @@ -579,7 +555,6 @@ OUString ClientBox::getPin() return OUString::number( m_aPinBox.GetValue() ); } - void ClientBox::MouseButtonDown( const MouseEvent& rMEvt ) { long nPos = PointToPos( rMEvt.GetPosPixel() ); @@ -593,7 +568,6 @@ void ClientBox::MouseButtonDown( const MouseEvent& rMEvt ) } } - bool ClientBox::Notify( NotifyEvent& rNEvt ) { if ( !m_bInDelete ) @@ -637,8 +611,6 @@ bool ClientBox::Notify( NotifyEvent& rNEvt ) return true; } - - long ClientBox::addEntry( ClientInfo* pClientInfo ) { long nPos = 0; @@ -676,7 +648,6 @@ long ClientBox::addEntry( ClientInfo* pClientInfo ) // pEntry->m_xPackage->addEventListener(uno::Reference< lang::XEventListener > ( m_xRemoveListener, uno::UNO_QUERY ) ); } - // pEntry->m_bHasOptions = m_pManager->supportsOptions( xPackage ); // pEntry->m_bUser = xPackage->getRepositoryName().equals( USER_PACKAGE_MANAGER ); // pEntry->m_bShared = xPackage->getRepositoryName().equals( SHARED_PACKAGE_MANAGER ); @@ -700,7 +671,6 @@ long ClientBox::addEntry( ClientInfo* pClientInfo ) return nPos; } - void ClientBox::DoScroll( long nDelta ) { m_nTopIndex += nDelta; @@ -713,7 +683,6 @@ void ClientBox::DoScroll( long nDelta ) m_aScrollBar.SetPosPixel( aNewSBPt ); } - IMPL_LINK( ClientBox, ScrollHdl, ScrollBar*, pScrBar ) { DoScroll( pScrBar->GetDelta() ); diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.hxx b/sd/source/ui/dlg/RemoteDialogClientBox.hxx index ad7464d7eff6..5b634384a39d 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.hxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.hxx @@ -58,17 +58,14 @@ struct ClientBoxEntry bool m_bActive :1; ClientInfo* m_pClientInfo; - ClientBoxEntry( ClientInfo* pClientInfo ); ~ClientBoxEntry(); }; - // class ExtensionBox_Impl class ClientBox; - class ClientRemovedListener : public ::cppu::WeakImplHelper1< ::com::sun::star::lang::XEventListener > { ClientBox *m_pParent; @@ -78,7 +75,6 @@ public: ClientRemovedListener( ClientBox *pParent ) { m_pParent = pParent; } virtual ~ClientRemovedListener(); - // XEventListener virtual void SAL_CALL disposing( ::com::sun::star::lang::EventObject const & evt ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -128,14 +124,12 @@ class ClientBox: bool HandleCursorKey( sal_uInt16 nKeyCode ); void DeleteRemoved(); - DECL_DLLPRIVATE_LINK( ScrollHdl, ScrollBar* ); //Index starts with 1. //Throws an com::sun::star::lang::IllegalArgumentException, when the index is invalid. void checkIndex(sal_Int32 pos) const; - public: ClientBox( Window* pParent, WinBits nStyle ); virtual ~ClientBox(); @@ -160,7 +154,6 @@ public: void RecalcAll(); void RemoveUnlocked(); - void selectEntry( const long nPos ); long addEntry( ClientInfo* pClientInfo ); void updateEntry( const ClientInfo* rPackageInfo ); diff --git a/sd/source/ui/dlg/SpellDialogChildWindow.cxx b/sd/source/ui/dlg/SpellDialogChildWindow.cxx index 8487e98c1c97..010aa4bac5ac 100644 --- a/sd/source/ui/dlg/SpellDialogChildWindow.cxx +++ b/sd/source/ui/dlg/SpellDialogChildWindow.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "SpellDialogChildWindow.hxx" #include <svx/svxids.hrc> #include <sfx2/app.hxx> @@ -36,7 +35,6 @@ SFX_IMPL_CHILDWINDOW_WITHID(SpellDialogChildWindow, SID_SPELL_DIALOG) #include <Outliner.hxx> #include "drawdoc.hxx" - namespace sd { SpellDialogChildWindow::SpellDialogChildWindow ( @@ -51,9 +49,6 @@ SpellDialogChildWindow::SpellDialogChildWindow ( ProvideOutliner(); } - - - SpellDialogChildWindow::~SpellDialogChildWindow (void) { if (mpSdOutliner != NULL) @@ -63,29 +58,16 @@ SpellDialogChildWindow::~SpellDialogChildWindow (void) delete mpSdOutliner; } - - - - - - - SfxChildWinInfo SpellDialogChildWindow::GetInfo (void) const { return ::svx::SpellDialogChildWindow::GetInfo(); } - - - void SpellDialogChildWindow::InvalidateSpellDialog (void) { ::svx::SpellDialogChildWindow::InvalidateSpellDialog(); } - - - ::svx::SpellPortions SpellDialogChildWindow::GetNextWrongSentence( bool /*bRecheck*/ ) { ::svx::SpellPortions aResult; @@ -111,9 +93,6 @@ void SpellDialogChildWindow::InvalidateSpellDialog (void) return aResult; } - - - void SpellDialogChildWindow::ApplyChangedSentence ( const ::svx::SpellPortions& rChanged, bool bRecheck ) { @@ -127,9 +106,6 @@ void SpellDialogChildWindow::ApplyChangedSentence ( } } - - - void SpellDialogChildWindow::GetFocus (void) { // In order to detect a cursor movement we could compare the @@ -139,16 +115,10 @@ void SpellDialogChildWindow::GetFocus (void) // in the SdOutliner class. } - - - void SpellDialogChildWindow::LoseFocus() { } - - - void SpellDialogChildWindow::ProvideOutliner (void) { ViewShellBase* pViewShellBase = PTR_CAST (ViewShellBase, SfxViewShell::Current()); @@ -198,8 +168,6 @@ void SpellDialogChildWindow::ProvideOutliner (void) } } - - } // end of namespace ::sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx index 400fde151eff..75c6245d0f85 100644 --- a/sd/source/ui/dlg/TemplateScanner.cxx +++ b/sd/source/ui/dlg/TemplateScanner.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "TemplateScanner.hxx" #include <comphelper/processfactory.hxx> @@ -58,7 +57,6 @@ const char IMPRESS_XML_TEMPLATE[] = MIMETYPE_VND_SUN_XML_IMPRESS_ASCII; const char IMPRESS_XML_TEMPLATE_B[] = "Impress 2.0"; const char IMPRESS_XML_TEMPLATE_OASIS[] = MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII; - class FolderDescriptor { public: @@ -126,9 +124,6 @@ int Classify (const OUString&, const OUString& rsURL) } // end of anonymous namespace - - - namespace sd { @@ -188,9 +183,6 @@ TemplateScanner::TemplateScanner (void) // empty; } - - - TemplateScanner::~TemplateScanner (void) { mpFolderDescriptors.reset(); @@ -203,9 +195,6 @@ TemplateScanner::~TemplateScanner (void) delete *I; } - - - TemplateScanner::State TemplateScanner::GetTemplateRoot (void) { State eNextState (INITIALIZE_FOLDER_SCANNING); @@ -217,9 +206,6 @@ TemplateScanner::State TemplateScanner::GetTemplateRoot (void) return eNextState; } - - - TemplateScanner::State TemplateScanner::InitializeEntryScanning (void) { State eNextState (SCAN_ENTRY); @@ -246,9 +232,6 @@ TemplateScanner::State TemplateScanner::InitializeEntryScanning (void) return eNextState; } - - - TemplateScanner::State TemplateScanner::ScanEntry (void) { State eNextState (ERROR); @@ -308,9 +291,6 @@ TemplateScanner::State TemplateScanner::ScanEntry (void) return eNextState; } - - - TemplateScanner::State TemplateScanner::InitializeFolderScanning (void) { State eNextState (ERROR); @@ -343,9 +323,6 @@ TemplateScanner::State TemplateScanner::InitializeFolderScanning (void) return eNextState; } - - - TemplateScanner::State TemplateScanner::GatherFolderList (void) { State eNextState (ERROR); @@ -378,9 +355,6 @@ TemplateScanner::State TemplateScanner::GatherFolderList (void) return eNextState; } - - - TemplateScanner::State TemplateScanner::ScanFolder (void) { State eNextState (ERROR); @@ -416,22 +390,12 @@ TemplateScanner::State TemplateScanner::ScanFolder (void) return eNextState; } - - - void TemplateScanner::Scan (void) { while (HasNextStep()) RunNextStep(); } - - - - - - - void TemplateScanner::RunNextStep (void) { switch (meState) @@ -480,9 +444,6 @@ void TemplateScanner::RunNextStep (void) } } - - - bool TemplateScanner::HasNextStep (void) { switch (meState) @@ -496,10 +457,6 @@ bool TemplateScanner::HasNextStep (void) } } - - - - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index 50cf43819dd2..434cac4886a6 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -66,14 +66,10 @@ SdDisplay::SdDisplay( Window* pWin, SdResId Id ) : SetBackground( Wallpaper( Color( rStyles.GetFieldColor() ) ) ); } - - SdDisplay::~SdDisplay() { } - - void SdDisplay::SetBitmapEx( BitmapEx* pBmpEx ) { if( pBmpEx ) @@ -88,8 +84,6 @@ void SdDisplay::SetBitmapEx( BitmapEx* pBmpEx ) } } - - void SdDisplay::Paint( const Rectangle& ) { Point aPt; @@ -106,8 +100,6 @@ void SdDisplay::Paint( const Rectangle& ) aBitmapEx.Draw( this, aPt, aBmpSize ); } - - void SdDisplay::SetScale( const Fraction& rFrac ) { aScale = rFrac; @@ -157,7 +149,6 @@ AnimationWindow::AnimationWindow( SfxBindings* pInBindings, aBtnCreateGroup ( this, SdResId( BTN_CREATE_GROUP ) ), aBtnHelp ( this, SdResId( BTN_HELP ) ), - pWin ( pParent ), m_nCurrentFrame ( EMPTY_FRAMELIST ), @@ -216,8 +207,6 @@ AnimationWindow::AnimationWindow( SfxBindings* pInBindings, aBtnRemoveAll.SetAccessibleRelationMemberOf( &aGrpBitmap ); } - - AnimationWindow::~AnimationWindow() { delete pControllerItem; @@ -234,8 +223,6 @@ AnimationWindow::~AnimationWindow() delete pMyDoc; } - - IMPL_LINK_NOARG(AnimationWindow, ClickFirstHdl) { m_nCurrentFrame = (m_FrameList.empty()) ? EMPTY_FRAMELIST : 0; @@ -244,16 +231,12 @@ IMPL_LINK_NOARG(AnimationWindow, ClickFirstHdl) return( 0L ); } - - IMPL_LINK_NOARG(AnimationWindow, ClickStopHdl) { bMovie = false; return( 0L ); } - - IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p ) { ScopeLockGuard aGuard( maPlayLock ); @@ -373,8 +356,6 @@ IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p ) return( 0L ); } - - IMPL_LINK_NOARG(AnimationWindow, ClickLastHdl) { m_nCurrentFrame = @@ -384,8 +365,6 @@ IMPL_LINK_NOARG(AnimationWindow, ClickLastHdl) return( 0L ); } - - IMPL_LINK( AnimationWindow, ClickRbtHdl, void *, p ) { if (m_FrameList.empty() || p == &aRbtGroup || aRbtGroup.IsChecked()) @@ -410,8 +389,6 @@ IMPL_LINK( AnimationWindow, ClickRbtHdl, void *, p ) return( 0L ); } - - IMPL_LINK( AnimationWindow, ClickGetObjectHdl, void *, pBtn ) { bAllObjects = pBtn == &aBtnGetAllObjects; @@ -424,8 +401,6 @@ IMPL_LINK( AnimationWindow, ClickGetObjectHdl, void *, pBtn ) return( 0L ); } - - IMPL_LINK( AnimationWindow, ClickRemoveBitmapHdl, void *, pBtn ) { SdPage* pPage = pMyDoc->GetSdPage(0, PK_STANDARD); @@ -501,8 +476,6 @@ IMPL_LINK( AnimationWindow, ClickRemoveBitmapHdl, void *, pBtn ) return( 0L ); } - - IMPL_LINK_NOARG(AnimationWindow, ClickCreateGroupHdl) { // Code now in CreatePresObj() @@ -513,8 +486,6 @@ IMPL_LINK_NOARG(AnimationWindow, ClickCreateGroupHdl) return( 0L ); } - - IMPL_LINK_NOARG(AnimationWindow, ModifyBitmapHdl) { sal_uLong nBmp = static_cast<sal_uLong>(aNumFldBitmap.GetValue()); @@ -531,8 +502,6 @@ IMPL_LINK_NOARG(AnimationWindow, ModifyBitmapHdl) return( 0L ); } - - IMPL_LINK_NOARG(AnimationWindow, ModifyTimeHdl) { sal_uLong nPos = static_cast<sal_uLong>(aNumFldBitmap.GetValue() - 1); @@ -544,8 +513,6 @@ IMPL_LINK_NOARG(AnimationWindow, ModifyTimeHdl) return( 0L ); } - - void AnimationWindow::UpdateControl(bool const bDisableCtrls) { if (!m_FrameList.empty()) @@ -576,7 +543,6 @@ void AnimationWindow::UpdateControl(bool const bDisableCtrls) aBmp = BitmapEx( aVD.GetBitmap( aObjRect.TopLeft(), aObjSize ) ); } - aCtlDisplay.SetBitmapEx( &aBmp ); } else @@ -648,8 +614,6 @@ void AnimationWindow::UpdateControl(bool const bDisableCtrls) ClickRbtHdl( NULL ); } - - void AnimationWindow::ResetAttrs() { aRbtGroup.Check(); @@ -660,8 +624,6 @@ void AnimationWindow::ResetAttrs() UpdateControl(); } - - void AnimationWindow::WaitInEffect( sal_uLong nMilliSeconds, sal_uLong nTime, SfxProgress* pProgress ) const { @@ -681,8 +643,6 @@ void AnimationWindow::WaitInEffect( sal_uLong nMilliSeconds, sal_uLong nTime, } } - - Fraction AnimationWindow::GetScale() { Fraction aFrac; @@ -708,8 +668,6 @@ Fraction AnimationWindow::GetScale() return( aFrac ); } - - void AnimationWindow::Resize() { if ( !IsFloatingMode() || @@ -752,7 +710,6 @@ void AnimationWindow::Resize() aBtnCreateGroup.Hide(); aGrpAnimation.Hide(); - aBtnFirst.SetPosPixel( aBtnFirst.GetPosPixel() + aPt ); aBtnReverse.SetPosPixel( aBtnReverse.GetPosPixel() + aPt ); aBtnStop.SetPosPixel( aBtnStop.GetPosPixel() + aPt ); @@ -808,8 +765,6 @@ void AnimationWindow::Resize() SfxDockingWindow::Resize(); } - - bool AnimationWindow::Close() { if( maPlayLock.isLocked() ) @@ -829,15 +784,11 @@ bool AnimationWindow::Close() } } - - void AnimationWindow::FillInfo( SfxChildWinInfo& rInfo ) const { SfxDockingWindow::FillInfo( rInfo ) ; } - - void AnimationWindow::AddObj (::sd::View& rView ) { // finish text entry mode to ensure that bitmap is identical with object @@ -1019,8 +970,6 @@ void AnimationWindow::AddObj (::sd::View& rView ) } } - - void AnimationWindow::CreateAnimObj (::sd::View& rView ) { ::Window* pOutWin = static_cast< ::Window*>(rView.GetFirstOutputDevice()); // GetWin( 0 ); @@ -1268,8 +1217,6 @@ AnimationControllerItem::AnimationControllerItem( { } - - void AnimationControllerItem::StateChanged( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pItem ) { @@ -1286,7 +1233,6 @@ void AnimationControllerItem::StateChanged( sal_uInt16 nSId, } } - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/dlg/assclass.cxx b/sd/source/ui/dlg/assclass.cxx index f0f1c62c7481..3c17c2099320 100644 --- a/sd/source/ui/dlg/assclass.cxx +++ b/sd/source/ui/dlg/assclass.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/debug.hxx> #include <vcl/ctrl.hxx> @@ -65,7 +64,6 @@ bool Assistent::NextPage() return false; } - bool Assistent::PreviousPage() { if(mnCurrentPage>1) @@ -80,7 +78,6 @@ bool Assistent::PreviousPage() return false; } - bool Assistent::GotoPage(const int nPageToGo) { DBG_ASSERT( (nPageToGo > 0) && (nPageToGo <= mnPages), "Page not aviable!"); @@ -116,7 +113,6 @@ bool Assistent::GotoPage(const int nPageToGo) return false; } - bool Assistent::IsLastPage() const { if(mnCurrentPage == mnPages) @@ -129,7 +125,6 @@ bool Assistent::IsLastPage() const return nPage > mnPages; } - bool Assistent::IsFirstPage() const { if(mnCurrentPage == 1) @@ -142,7 +137,6 @@ bool Assistent::IsFirstPage() const return nPage == 0; } - bool Assistent::IsEnabled( int nPage ) const { DBG_ASSERT( (nPage>0) && (nPage <= mnPages), "Page not aviable!" ); diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx index 7ff5aaafa5ad..607678441ce4 100644 --- a/sd/source/ui/dlg/copydlg.cxx +++ b/sd/source/ui/dlg/copydlg.cxx @@ -29,8 +29,6 @@ #include <sfx2/app.hxx> - - #include "sdattr.hxx" #include "View.hxx" @@ -74,7 +72,6 @@ CopyDlg::CopyDlg(::Window* pWindow, const SfxItemSet& rInAttrs, m_pBtnSetViewData->SetClickHdl( LINK( this, CopyDlg, SetViewData ) ); m_pBtnSetDefault->SetClickHdl( LINK( this, CopyDlg, SetDefault ) ); - FieldUnit eFUnit( SfxModule::GetCurrentFieldUnit() ); SetFieldUnit( *m_pMtrFldMoveX, eFUnit, true ); @@ -296,7 +293,6 @@ IMPL_LINK_NOARG(CopyDlg, SetDefault) return 0; } - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx index 3b53661302be..6a64869ece07 100644 --- a/sd/source/ui/dlg/custsdlg.cxx +++ b/sd/source/ui/dlg/custsdlg.cxx @@ -225,7 +225,6 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p ) m_pLbCustomShows->InsertEntry( pShow->GetName() ); m_pLbCustomShows->SelectEntry( pShow->GetName() ); - bModified = true; } } diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx index b90d2de7e6c7..c093b95098c9 100644 --- a/sd/source/ui/dlg/diactrl.cxx +++ b/sd/source/ui/dlg/diactrl.cxx @@ -51,7 +51,6 @@ SdPagesField::SdPagesField( Window* pParent, aStr += "XXX"; Size aSize( GetTextWidth( aStr )+20, GetTextHeight()+6 ); - SetSizePixel( aSize ); // set parameter of MetricFields @@ -65,14 +64,10 @@ SdPagesField::SdPagesField( Window* pParent, Show(); } - - SdPagesField::~SdPagesField() { } - - void SdPagesField::UpdatePagesField( const SfxUInt16Item* pItem ) { if( pItem ) @@ -88,8 +83,6 @@ void SdPagesField::UpdatePagesField( const SfxUInt16Item* pItem ) SetText( OUString() ); } - - void SdPagesField::Modify() { SfxUInt16Item aItem( SID_PAGES_PER_ROW, (sal_uInt16) GetValue() ); @@ -109,14 +102,10 @@ SdTbxCtlDiaPages::SdTbxCtlDiaPages( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& { } - - SdTbxCtlDiaPages::~SdTbxCtlDiaPages() { } - - void SdTbxCtlDiaPages::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { @@ -143,13 +132,9 @@ void SdTbxCtlDiaPages::StateChanged( sal_uInt16, } } - - Window* SdTbxCtlDiaPages::CreateItemWindow( Window* pParent ) { return new SdPagesField( pParent, m_xFrame ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index 0837eb514017..b434666c28a8 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -76,7 +76,6 @@ using namespace ::sd; using ::std::vector; - class PasswordEntry { public: @@ -84,8 +83,6 @@ public: OUString maPath; }; - - /** A simple wrapper that looks like a PushButton and is used to force the broadcasting of focus events primarily for accessibility tools. Forcing focus events is achieved by using two identical PushButtons @@ -108,10 +105,6 @@ private: bool mbIsFirstButtonActive; }; - - - - class AssistentDlgImpl : public SfxListener { public: @@ -325,10 +318,6 @@ public: }; - - - - AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink, bool bAutoPilot ) : mpTemplateRegion(NULL), mpLayoutRegion(NULL), @@ -584,7 +573,6 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink, mpPage5PageListCT->SetSelectHdl(LINK(this,AssistentDlgImpl, PageSelectHdl)); - // general mpLastPageButton->SetClickHdl(LINK(this,AssistentDlgImpl, LastPageHdl )); mpNextPageButton->SetClickHdl(LINK(this,AssistentDlgImpl, NextPageHdl )); @@ -655,9 +643,6 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink, } } - - - AssistentDlgImpl::~AssistentDlgImpl() { CloseDocShell(); @@ -698,9 +683,6 @@ void AssistentDlgImpl::EndDialog( long ) mpWindow = NULL; } - - - void AssistentDlgImpl::ScanDocmenu (void) { if( mbRecentDocumentsReady ) @@ -779,8 +761,6 @@ void AssistentDlgImpl::ScanDocmenu (void) } } - - void AssistentDlgImpl::ProvideTemplates (void) { if ( ! mbTemplatesReady) @@ -868,9 +848,6 @@ void AssistentDlgImpl::TemplateScanDone ( UpdatePage(); } - - - // ******************************************************************** // state methods // ******************************************************************** @@ -1231,7 +1208,6 @@ IMPL_LINK( AssistentDlgImpl, StartTypeHdl, RadioButton *, pButton ) return 0; } - IMPL_LINK_NOARG(AssistentDlgImpl, NextPageHdl) { // When changing from the first to the second page make sure that the @@ -1505,7 +1481,6 @@ void AssistentDlgImpl::UpdatePreview( bool bDocPreview ) xDocShell = pRet->GetFrame()->GetObjectShell(); } - Application::SetDefDialogParent( pParent ); mnShowPage = 0; @@ -1646,9 +1621,6 @@ bool AssistentDlgImpl::IsOwnFormat( const OUString& rPath ) return !aExt.equalsIgnoreAsciiCase( "ppt" ); } - - - OUString AssistentDlgImpl::GetUiTextForCommand (const OUString& sCommandURL) { OUString sLabel; @@ -1701,9 +1673,6 @@ OUString AssistentDlgImpl::GetUiTextForCommand (const OUString& sCommandURL) return sLabel; } - - - Image AssistentDlgImpl::GetUiIconForCommand (const OUString& sCommandURL) { Image aIcon; @@ -1752,9 +1721,6 @@ Image AssistentDlgImpl::GetUiIconForCommand (const OUString& sCommandURL) return aIcon; } - - - AssistentDlg::AssistentDlg(Window* pParent, bool bAutoPilot) : ModalDialog(pParent, "Assistent", "modules/simpress/ui/assistentdialog.ui") { @@ -1858,9 +1824,6 @@ uno::Sequence< beans::NamedValue > AssistentDlg::GetPassword() return mpImpl->GetPassword( mpImpl->maDocFile ); } - - - //===== NextButton ============================================================ NextButton::NextButton (::Window* pParent) : @@ -1873,9 +1836,6 @@ NextButton::NextButton (::Window* pParent) : mpNextButton2->Hide(); } - - - void NextButton::ForceFocusEventBroadcast (void) { // Hide the currently visible button and show and focus the other one. @@ -1895,9 +1855,6 @@ void NextButton::ForceFocusEventBroadcast (void) } } - - - void NextButton::SetClickHdl (const Link& rLink) { // Forward the setting of the click handler to the two buttons @@ -1906,9 +1863,6 @@ void NextButton::SetClickHdl (const Link& rLink) mpNextButton2->SetClickHdl(rLink); } - - - bool NextButton::IsEnabled (void) { // Because the buttons are both either enabled or disabled, it is @@ -1916,9 +1870,6 @@ bool NextButton::IsEnabled (void) return mpNextButton1->IsEnabled(); } - - - void NextButton::Enable (bool bEnable) { // Enable or disable both buttons but do not change visibility or focus. diff --git a/sd/source/ui/dlg/dlgchar.cxx b/sd/source/ui/dlg/dlgchar.cxx index da4dced8eece..a2a669a5b913 100644 --- a/sd/source/ui/dlg/dlgchar.cxx +++ b/sd/source/ui/dlg/dlgchar.cxx @@ -48,8 +48,6 @@ SdCharDlg::SdCharDlg( Window* pParent, const SfxItemSet* pAttr, mnCharPosition = AddTabPage( "RID_SVXPAGE_CHAR_POSITION", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), 0 ); } - - void SdCharDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); @@ -67,6 +65,4 @@ void SdCharDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx index 921ce84dd584..48069700a855 100644 --- a/sd/source/ui/dlg/dlgfield.cxx +++ b/sd/source/ui/dlg/dlgfield.cxx @@ -239,7 +239,6 @@ void SdModifyFieldDlg::FillFormatList() } - } void SdModifyFieldDlg::FillControls() @@ -299,7 +298,6 @@ void SdModifyFieldDlg::FillControls() m_pLbFormat->SaveValue(); } - IMPL_LINK_NOARG(SdModifyFieldDlg, LanguageChangeHdl) { FillFormatList(); diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx index 73d6de45cda7..1b1757b286ad 100644 --- a/sd/source/ui/dlg/dlgolbul.cxx +++ b/sd/source/ui/dlg/dlgolbul.cxx @@ -178,7 +178,6 @@ const SfxItemSet* OutlineBulletDlg::GetOutputItemSet() const // #i35937 - removed EE_PARA_BULLETSTATE setting } - if(bTitle && pOutputSet->GetItemState(EE_PARA_NUMBULLET,true) == SFX_ITEM_ON ) { SvxNumBulletItem* pBulletItem = (SvxNumBulletItem*)pOutputSet->GetItem(EE_PARA_NUMBULLET,true); diff --git a/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx index 9f546fe47399..ff137135c78a 100644 --- a/sd/source/ui/dlg/dlgpage.cxx +++ b/sd/source/ui/dlg/dlgpage.cxx @@ -64,7 +64,6 @@ SdPageDlg::SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet* RemoveTabPage( "RID_SVXPAGE_AREA" ); } - void SdPageDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx index 089c4722ecae..eaaf2ccf8bdb 100644 --- a/sd/source/ui/dlg/dlgsnap.cxx +++ b/sd/source/ui/dlg/dlgsnap.cxx @@ -28,7 +28,6 @@ #include "drawdoc.hxx" #include "dlgsnap.hxx" - /** * dialog to adjust grid (scarcely ESO!) */ @@ -184,6 +183,4 @@ void SdSnapLineDlg::SetInputFields(bool bEnableX, bool bEnableY) } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx index 6c15a684204a..2a72f6773cb6 100644 --- a/sd/source/ui/dlg/docprev.cxx +++ b/sd/source/ui/dlg/docprev.cxx @@ -205,7 +205,6 @@ bool SdDocPreviewWin::Notify( NotifyEvent& rNEvt ) return Control::Notify( rNEvt ); } - void SdDocPreviewWin::updateViewSettings() { ::sd::DrawDocShell* pDocShell = PTR_CAST(::sd::DrawDocShell,mpObj); @@ -250,7 +249,6 @@ void SdDocPreviewWin::updateViewSettings() ::sd::DrawView* pView = new ::sd::DrawView(pDocShell, this, NULL); - const Size aSize( pPage->GetSize() ); pView->SetBordVisible( false ); diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx index daf2aca19cd5..3e5ef63030c5 100644 --- a/sd/source/ui/dlg/filedlg.cxx +++ b/sd/source/ui/dlg/filedlg.cxx @@ -42,8 +42,6 @@ #include "strings.hrc" #include <vcl/graphicfilter.hxx> - - // ----------- SdFileDialog_Imp --------------------------- class SdFileDialog_Imp : public sfx2::FileDialogHelper @@ -76,7 +74,6 @@ public: virtual void SAL_CALL ControlStateChanged( const css::ui::dialogs::FilePickerEvent& aEvent ) SAL_OVERRIDE; }; - void SAL_CALL SdFileDialog_Imp::ControlStateChanged( const css::ui::dialogs::FilePickerEvent& aEvent ) { SolarMutexGuard aGuard; @@ -99,7 +96,6 @@ void SAL_CALL SdFileDialog_Imp::ControlStateChanged( const css::ui::dialogs::Fil } } - IMPL_LINK_NOARG(SdFileDialog_Imp, PlayMusicHdl) { maUpdateTimer.Stop(); @@ -167,7 +163,6 @@ IMPL_LINK_NOARG(SdFileDialog_Imp, PlayMusicHdl) return 0; } - IMPL_LINK_NOARG(SdFileDialog_Imp, IsMusicStoppedHdl) { SolarMutexGuard aGuard; @@ -181,7 +176,6 @@ IMPL_LINK_NOARG(SdFileDialog_Imp, IsMusicStoppedHdl) return 0L; } - if( mxControlAccess.is() ) { try @@ -224,7 +218,6 @@ void SdFileDialog_Imp::CheckSelectionState() } } - SdFileDialog_Imp::SdFileDialog_Imp( const short nDialogType, bool bUsableSelection ) : FileDialogHelper( nDialogType, 0 ), @@ -272,15 +265,12 @@ SdFileDialog_Imp::SdFileDialog_Imp( const short nDialogType, } } - - SdFileDialog_Imp::~SdFileDialog_Imp() { if( mnPlaySoundEvent ) Application::RemoveUserEvent( mnPlaySoundEvent ); } - ErrCode SdFileDialog_Imp::Execute() { // make sure selection checkbox is disabled if @@ -289,10 +279,8 @@ ErrCode SdFileDialog_Imp::Execute() return FileDialogHelper::Execute(); } - // ----------- SdOpenSoundFileDialog ----------------------- - // these are simple forwarders SdOpenSoundFileDialog::SdOpenSoundFileDialog() : mpImpl( @@ -323,24 +311,20 @@ SdOpenSoundFileDialog::SdOpenSoundFileDialog() : #endif } - SdOpenSoundFileDialog::~SdOpenSoundFileDialog() { } - ErrCode SdOpenSoundFileDialog::Execute() { return mpImpl->Execute(); } - OUString SdOpenSoundFileDialog::GetPath() const { return mpImpl->GetPath(); } - void SdOpenSoundFileDialog::SetPath( const OUString& rPath ) { mpImpl->SetDisplayDirectory( rPath ); diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx index da5fe9a9cc1e..fbffc0846447 100644 --- a/sd/source/ui/dlg/gluectrl.cxx +++ b/sd/source/ui/dlg/gluectrl.cxx @@ -54,8 +54,6 @@ static const sal_uInt16 aEscDirArray[] = // SDRESC_ALL }; - - SFX_IMPL_TOOLBOX_CONTROL( SdTbxCtlGlueEscDir, SfxUInt16Item ) /** @@ -172,7 +170,6 @@ Window* SdTbxCtlGlueEscDir::CreateItemWindow( Window *pParent ) return( NULL ); } - /** * Returns position in the array for EscDir (Mapping for Listbox) */ diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index 48c3c0b1dddd..6fb37a750e8e 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -42,7 +42,6 @@ #include "drawdoc.hxx" #include "ViewShell.hxx" - // preview control for presentation layout #include <vcl/ctrl.hxx> #include <tools/color.hxx> @@ -87,10 +86,8 @@ public: } - // tab page for slide & header'n'notes - namespace sd { @@ -166,11 +163,8 @@ public: } - - using namespace ::sd; - HeaderFooterDialog::HeaderFooterDialog( ViewShell* pViewShell, ::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ) : TabDialog ( pParent, "HeaderFooterDialog", "modules/simpress/ui/headerfooterdialog.ui" ), mpDoc( pDoc ), @@ -244,16 +238,12 @@ HeaderFooterDialog::HeaderFooterDialog( ViewShell* pViewShell, ::Window* pParent mpNotesHandoutsTabPage->init( maNotesHandoutSettings, false ); } - - HeaderFooterDialog::~HeaderFooterDialog() { delete mpSlideTabPage; delete mpNotesHandoutsTabPage; } - - IMPL_LINK( HeaderFooterDialog, ActivatePageHdl, TabControl *, pTabCtrl ) { const sal_uInt16 nId = pTabCtrl->GetCurPageId(); @@ -265,39 +255,29 @@ IMPL_LINK( HeaderFooterDialog, ActivatePageHdl, TabControl *, pTabCtrl ) return 0; } - - IMPL_LINK_NOARG(HeaderFooterDialog, DeactivatePageHdl) { return sal_True; } - - IMPL_LINK_NOARG(HeaderFooterDialog, ClickApplyToAllHdl) { ApplyToAll(); return 0; } - - IMPL_LINK_NOARG(HeaderFooterDialog, ClickApplyHdl) { Apply(); return 0; } - - IMPL_LINK_NOARG(HeaderFooterDialog, ClickCancelHdl) { Cancel(); return 0; } - - short HeaderFooterDialog::Execute() { sal_uInt16 nRet = TabDialog::Execute(); @@ -306,8 +286,6 @@ short HeaderFooterDialog::Execute() return nRet; } - - void HeaderFooterDialog::ApplyToAll() { sal_uInt16 tabId = mpTabCtrl->GetCurPageId(); @@ -315,8 +293,6 @@ void HeaderFooterDialog::ApplyToAll() EndDialog(1); } - - void HeaderFooterDialog::Apply() { sal_uInt16 tabId = mpTabCtrl->GetCurPageId(); @@ -324,15 +300,11 @@ void HeaderFooterDialog::Apply() EndDialog(1); } - - void HeaderFooterDialog::Cancel() { EndDialog(); } - - void HeaderFooterDialog::apply( bool bToAll, bool bForceSlides ) { SdUndoGroup* pUndoGroup = new SdUndoGroup(mpDoc); @@ -411,16 +383,12 @@ void HeaderFooterDialog::apply( bool bToAll, bool bForceSlides ) mpViewShell->GetViewFrame()->GetObjectShell()->GetUndoManager()->AddUndoAction(pUndoGroup); } - - void HeaderFooterDialog::change( SdUndoGroup* pUndoGroup, SdPage* pPage, const HeaderFooterSettings& rNewSettings ) { pUndoGroup->AddAction(new SdHeaderFooterUndoAction(mpDoc, pPage, rNewSettings )); pPage->setHeaderFooterSettings( rNewSettings ); } - - HeaderFooterTabPage::HeaderFooterTabPage( ::Window* pWindow, SdDrawDocument* pDoc, SdPage* pActualPage, bool bHandoutMode ) : TabPage( pWindow, "HeaderFooterTab", "modules/simpress/ui/headerfootertab.ui" ), mpDoc(pDoc), @@ -481,23 +449,17 @@ HeaderFooterTabPage::HeaderFooterTabPage( ::Window* pWindow, SdDrawDocument* pDo FillFormatList(SVXDATEFORMAT_A); } - HeaderFooterTabPage::~HeaderFooterTabPage() { } - - IMPL_LINK_NOARG(HeaderFooterTabPage, LanguageChangeHdl) { FillFormatList( (int)(sal_IntPtr)mpCBDateTimeFormat->GetEntryData( mpCBDateTimeFormat->GetSelectEntryPos() ) ); - return 0L; } - - void HeaderFooterTabPage::FillFormatList( int eFormat ) { LanguageType eLanguage = mpCBDateTimeLanguage->GetSelectLanguage(); @@ -523,8 +485,6 @@ void HeaderFooterTabPage::FillFormatList( int eFormat ) } } - - void HeaderFooterTabPage::init( const HeaderFooterSettings& rSettings, bool bNotOnTitle ) { mpCBDateTime->Check( rSettings.mbDateTimeVisible ); @@ -559,8 +519,6 @@ void HeaderFooterTabPage::init( const HeaderFooterSettings& rSettings, bool bNot update(); } - - void HeaderFooterTabPage::getData( HeaderFooterSettings& rSettings, bool& rNotOnTitle ) { rSettings.mbDateTimeVisible = mpCBDateTime->IsChecked(); @@ -582,8 +540,6 @@ void HeaderFooterTabPage::getData( HeaderFooterSettings& rSettings, bool& rNotOn rNotOnTitle = mpCBNotOnTitle->IsChecked(); } - - void HeaderFooterTabPage::update() { mpRBDateTimeFixed->Enable( mpCBDateTime->IsChecked() ); @@ -603,8 +559,6 @@ void HeaderFooterTabPage::update() mpCTPreview->update( aSettings ); } - - IMPL_LINK_NOARG(HeaderFooterTabPage, UpdateOnClickHdl) { update(); @@ -612,8 +566,6 @@ IMPL_LINK_NOARG(HeaderFooterTabPage, UpdateOnClickHdl) return 0; } - - void HeaderFooterTabPage::GetOrSetDateTimeLanguage( LanguageType &rLanguage, bool bSet ) { if( mbHandoutMode ) @@ -645,8 +597,6 @@ void HeaderFooterTabPage::GetOrSetDateTimeLanguage( LanguageType &rLanguage, boo } } - - void HeaderFooterTabPage::GetOrSetDateTimeLanguage( LanguageType &rLanguage, bool bSet, SdPage* pPage ) { if( pPage ) @@ -688,7 +638,6 @@ void HeaderFooterTabPage::GetOrSetDateTimeLanguage( LanguageType &rLanguage, boo } } - if( aFieldInfo.pFieldItem != NULL ) { if( bSet ) @@ -722,16 +671,12 @@ void HeaderFooterTabPage::GetOrSetDateTimeLanguage( LanguageType &rLanguage, boo } } - - PresLayoutPreview::PresLayoutPreview( ::Window* pParent ) : Control(pParent) , mpMaster(NULL) { } - - extern "C" SAL_DLLPUBLIC_EXPORT ::Window* SAL_CALL makePresLayoutPreview( ::Window *pParent, VclBuilder::stringmap & ) { return new PresLayoutPreview( pParent ); @@ -746,8 +691,6 @@ Size PresLayoutPreview::GetOptimalSize() const return LogicToPixel(Size(80, 80), MAP_APPFONT); } - - void PresLayoutPreview::init( SdPage *pMaster ) { mpMaster = pMaster; @@ -760,8 +703,6 @@ void PresLayoutPreview::update( HeaderFooterSettings& rSettings ) Invalidate(); } - - void PresLayoutPreview::Paint( OutputDevice& aOut, SdrTextObj* pObj, bool bVisible, bool bDotted /* = false*/ ) { // get object transformation @@ -807,8 +748,6 @@ void PresLayoutPreview::Paint( OutputDevice& aOut, SdrTextObj* pObj, bool bVisib } } - - void PresLayoutPreview::Paint( const Rectangle& ) { Push(); diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx index 8c104974e03d..afd20fdf28dd 100644 --- a/sd/source/ui/dlg/inspagob.cxx +++ b/sd/source/ui/dlg/inspagob.cxx @@ -26,7 +26,6 @@ #include "DrawDocShell.hxx" #include "ViewShell.hxx" - SdInsertPagesObjsDlg::SdInsertPagesObjsDlg( ::Window* pWindow, const SdDrawDocument* pInDoc, SfxMedium* pSfxMedium, const OUString& rFileName ) @@ -54,7 +53,6 @@ SdInsertPagesObjsDlg::SdInsertPagesObjsDlg( Reset(); } - SdInsertPagesObjsDlg::~SdInsertPagesObjsDlg() { } @@ -131,5 +129,4 @@ IMPL_LINK_NOARG(SdInsertPagesObjsDlg, SelectObjectHdl) return( 0 ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/dlg/layeroptionsdlg.cxx b/sd/source/ui/dlg/layeroptionsdlg.cxx index e9c56ce7891c..8915aacaf0f0 100644 --- a/sd/source/ui/dlg/layeroptionsdlg.cxx +++ b/sd/source/ui/dlg/layeroptionsdlg.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <svl/itemset.hxx> #include <vcl/layout.hxx> diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx index b0ac4252c8fb..efe77093e9c4 100644 --- a/sd/source/ui/dlg/morphdlg.cxx +++ b/sd/source/ui/dlg/morphdlg.cxx @@ -89,8 +89,6 @@ void MorphDlg::LoadSettings() m_pCbxAttributes->Check( bAttrib ); } - - void MorphDlg::SaveSettings() const { SvStorageStreamRef xOStm( SD_MOD()->GetOptionStream( OUString(SD_OPTION_MORPHING) , diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 82f4f65f70ee..be7b2cd18dfd 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -150,16 +150,12 @@ SdNavigatorWin::SdNavigatorWin( rUpdateRequest(); } - - SdNavigatorWin::~SdNavigatorWin() { delete mpNavigatorCtrlItem; delete mpPageNameCtrlItem; } - - //when object is marked , fresh the corresponding entry tree . void SdNavigatorWin::FreshTree( const SdDrawDocument* pDoc ) { @@ -304,16 +300,11 @@ IMPL_LINK_NOARG(SdNavigatorWin, SelectToolboxHdl) return 0; } - - - IMPL_LINK_NOARG(SdNavigatorWin, ClickToolboxHdl) { return 0; } - - IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox ) { sal_uInt16 nId = maToolbox.GetCurItemId(); @@ -390,8 +381,6 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox ) return 0; } - - IMPL_LINK_NOARG(SdNavigatorWin, ClickObjectHdl) { if( !mbDocImported || maLbDocs.GetSelectEntryPos() != 0 ) @@ -428,8 +417,6 @@ IMPL_LINK_NOARG(SdNavigatorWin, ClickObjectHdl) return( 0L ); } - - IMPL_LINK_NOARG(SdNavigatorWin, SelectDocumentHdl) { OUString aStrLb = maLbDocs.GetSelectEntry(); @@ -509,9 +496,6 @@ IMPL_LINK( SdNavigatorWin, MenuSelectHdl, Menu *, pMenu ) return( 0 ); } - - - IMPL_LINK( SdNavigatorWin, ShapeFilterCallback, Menu *, pMenu ) { if (pMenu != NULL) @@ -559,8 +543,6 @@ IMPL_LINK( SdNavigatorWin, ShapeFilterCallback, Menu *, pMenu ) return 0; } - - void SdNavigatorWin::Resize() { Size aWinSize( GetOutputSizePixel() ); @@ -598,8 +580,6 @@ void SdNavigatorWin::Resize() Window::Resize(); } - - bool SdNavigatorWin::InsertFile(const OUString& rFileName) { INetURLObject aURL( rFileName ); @@ -675,8 +655,6 @@ bool SdNavigatorWin::InsertFile(const OUString& rFileName) return true; } - - void SdNavigatorWin::RefreshDocumentLB( const OUString* pDocName ) { sal_Int32 nPos = 0; @@ -744,8 +722,6 @@ void SdNavigatorWin::RefreshDocumentLB( const OUString* pDocName ) maLbDocs.SelectEntryPos( nPos ); } - - sal_uInt16 SdNavigatorWin::GetDragTypeSdResId( NavigatorDragType eDT, bool bImage ) { switch( eDT ) @@ -763,8 +739,6 @@ sal_uInt16 SdNavigatorWin::GetDragTypeSdResId( NavigatorDragType eDT, bool bImag return( 0 ); } - - NavDocInfo* SdNavigatorWin::GetDocInfo() { sal_uInt32 nPos = maLbDocs.GetSelectEntryPos(); @@ -820,7 +794,6 @@ bool SdNavigatorWin::Notify(NotifyEvent& rNEvt) return( nOK ); } - /** * catch ESCAPE in order to end show */ @@ -873,8 +846,6 @@ void SdNavigatorWin::ApplyImageList() SetDragImage(); } - - /** * ControllerItem for Navigator */ @@ -889,8 +860,6 @@ SdNavigatorControllerItem::SdNavigatorControllerItem( { } - - void SdNavigatorControllerItem::StateChanged( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pItem ) { @@ -974,8 +943,6 @@ SdPageNameControllerItem::SdPageNameControllerItem( { } - - void SdPageNameControllerItem::StateChanged( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pItem ) { diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx index 2911984c0e2a..0ab868f88990 100644 --- a/sd/source/ui/dlg/present.cxx +++ b/sd/source/ui/dlg/present.cxx @@ -35,7 +35,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; using namespace ::com::sun::star::beans; - SdStartPresentationDlg::SdStartPresentationDlg( Window* pWindow, const SfxItemSet& rInAttrs, const std::vector<OUString> &rPageNames, SdCustomShowList* pCSList ) : @@ -334,5 +333,4 @@ IMPL_LINK_NOARG(SdStartPresentationDlg, ChangePauseHdl) return( 0L ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx index d0c8c2a84432..fc868ddaadde 100644 --- a/sd/source/ui/dlg/prltempl.cxx +++ b/sd/source/ui/dlg/prltempl.cxx @@ -221,15 +221,11 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, nHatchingListState = CT_NONE; } - - SdPresLayoutTemplateDlg::~SdPresLayoutTemplateDlg() { delete pOutSet; } - - void SdPresLayoutTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { SfxAllItemSet aSet(*(aInputSet.GetPool())); @@ -299,8 +295,6 @@ const SfxItemSet* SdPresLayoutTemplateDlg::GetOutputItemSet() const return SfxTabDialog::GetOutputItemSet(); } - - sal_uInt16 SdPresLayoutTemplateDlg::GetOutlineLevel() const { switch( ePO ) @@ -320,6 +314,4 @@ sal_uInt16 SdPresLayoutTemplateDlg::GetOutlineLevel() const return 0; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx index 5f4ffa2de9a9..e1cbbd50a23d 100644 --- a/sd/source/ui/dlg/prntopts.cxx +++ b/sd/source/ui/dlg/prntopts.cxx @@ -72,14 +72,10 @@ SdPrintOptions::SdPrintOptions( Window* pParent, const SfxItemSet& rInAttrs ) : m_pCbxBack->SetAccessibleRelationLabeledBy( m_pRbtBooklet ); } - - SdPrintOptions::~SdPrintOptions() { } - - bool SdPrintOptions::FillItemSet( SfxItemSet* rAttrs ) { if( m_pCbxDraw->IsValueChangedFromSaved() || @@ -131,8 +127,6 @@ bool SdPrintOptions::FillItemSet( SfxItemSet* rAttrs ) return false; } - - void SdPrintOptions::Reset( const SfxItemSet* rAttrs ) { const SdOptionsPrintItem* pPrintOpts = NULL; @@ -188,16 +182,12 @@ void SdPrintOptions::Reset( const SfxItemSet* rAttrs ) ClickBookletHdl( NULL ); } - - SfxTabPage* SdPrintOptions::Create( Window* pWindow, const SfxItemSet* rOutAttrs ) { return( new SdPrintOptions( pWindow, *rOutAttrs ) ); } - - IMPL_LINK( SdPrintOptions, ClickCheckboxHdl, CheckBox *, pCbx ) { // there must be at least one of them checked @@ -208,8 +198,6 @@ IMPL_LINK( SdPrintOptions, ClickCheckboxHdl, CheckBox *, pCbx ) return 0; } - - IMPL_LINK_NOARG(SdPrintOptions, ClickBookletHdl) { updateControls(); diff --git a/sd/source/ui/dlg/sdabstdlg.cxx b/sd/source/ui/dlg/sdabstdlg.cxx index fb75b373ca0d..acf4705329b9 100644 --- a/sd/source/ui/dlg/sdabstdlg.cxx +++ b/sd/source/ui/dlg/sdabstdlg.cxx @@ -55,5 +55,4 @@ SdAbstractDialogFactory* SdAbstractDialogFactory::Create() return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx index 2ddf8e05841c..d6b14c909c9d 100644 --- a/sd/source/ui/dlg/sdpreslt.cxx +++ b/sd/source/ui/dlg/sdpreslt.cxx @@ -31,7 +31,6 @@ #include "DrawDocShell.hxx" #include <boost/scoped_ptr.hpp> - SdPresLayoutDlg::SdPresLayoutDlg(::sd::DrawDocShell* pDocShell, ::Window* pWindow, const SfxItemSet& rInAttrs) : ModalDialog(pWindow, "SlideDesignDialog", @@ -123,7 +122,6 @@ void SdPresLayoutDlg::GetAttr(SfxItemSet& rOutAttrs) rOutAttrs.Put( SfxBoolItem( ATTR_PRESLAYOUT_CHECK_MASTERS, m_pCbxCheckMasters->IsChecked() ) ); } - /** * Fills ValueSet with bitmaps */ @@ -157,7 +155,6 @@ void SdPresLayoutDlg::FillValueSet() m_pVS->Show(); } - /** * DoubleClick handler */ diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 370c0da71fc9..72d152fc5ddd 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <sal/types.h> #include <sot/formats.hxx> #include <sot/storage.hxx> @@ -72,7 +71,6 @@ public: Image maImgGroup; }; - bool SdPageObjsTLB::bIsInDrag = false; bool SdPageObjsTLB::IsInDrag() @@ -82,10 +80,8 @@ bool SdPageObjsTLB::IsInDrag() sal_uInt32 SdPageObjsTLB::SdPageObjsTransferable::mnListBoxDropFormatId = SAL_MAX_UINT32; - // - SdPageObjsTLB::SdPageObjsTransferable - - SdPageObjsTLB::SdPageObjsTransferable::SdPageObjsTransferable( SdPageObjsTLB& rParent, const INetBookmark& rBookmark, @@ -114,8 +110,6 @@ SdPageObjsTLB::SdPageObjsTransferable::~SdPageObjsTransferable() { } - - void SdPageObjsTLB::SdPageObjsTransferable::AddSupportedFormats() { AddFormat(SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK); @@ -123,8 +117,6 @@ void SdPageObjsTLB::SdPageObjsTransferable::AddSupportedFormats() AddFormat(GetListBoxDropFormatId()); } - - bool SdPageObjsTLB::SdPageObjsTransferable::GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& /*rDestDoc*/ ) { sal_uLong nFormatId = SotExchange::GetFormat( rFlavor ); @@ -143,22 +135,12 @@ bool SdPageObjsTLB::SdPageObjsTransferable::GetData( const css::datatransfer::Da } } - - void SdPageObjsTLB::SdPageObjsTransferable::DragFinished( sal_Int8 nDropAction ) { mrParent.OnDragFinished( nDropAction ); SdTransferable::DragFinished(nDropAction); } - - - - - - - - sal_Int64 SAL_CALL SdPageObjsTLB::SdPageObjsTransferable::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) { sal_Int64 nRet; @@ -184,8 +166,6 @@ const ::com::sun::star::uno::Sequence< sal_Int8 >& SdPageObjsTLB::SdPageObjsTran return theSdPageObjsTLBUnoTunnelId::get().getSeq(); } - - SdPageObjsTLB::SdPageObjsTransferable* SdPageObjsTLB::SdPageObjsTransferable::getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxData ) throw() { @@ -203,7 +183,6 @@ SdPageObjsTLB::SdPageObjsTransferable* SdPageObjsTLB::SdPageObjsTransferable::ge return 0; } - sal_uInt32 SdPageObjsTLB::SdPageObjsTransferable::GetListBoxDropFormatId (void) { if (mnListBoxDropFormatId == SAL_MAX_UINT32) @@ -212,7 +191,6 @@ sal_uInt32 SdPageObjsTLB::SdPageObjsTransferable::GetListBoxDropFormatId (void) return mnListBoxDropFormatId; } - SdPageObjsTLB::SdPageObjsTLB( Window* pParentWin, const SdResId& rSdResId ) : SvTreeListBox ( pParentWin, rSdResId ) , bisInSdNavigatorWin ( false ) @@ -275,7 +253,6 @@ SdPageObjsTLB::SdPageObjsTLB( Window* pParentWin, WinBits nStyle ) SV_DRAGDROP_APP_MOVE | SV_DRAGDROP_APP_COPY | SV_DRAGDROP_APP_DROP ); } - SdPageObjsTLB::~SdPageObjsTLB() { if ( mpBookmarkDoc ) @@ -293,7 +270,6 @@ OUString SdPageObjsTLB::getAltLongDescText(SvTreeListEntry* pEntry , bool isAltT SdrObject* pObj = NULL; SdPage* pPage = NULL; - OUString ParentName = GetEntryText( GetRootLevelParent( pEntry ) ); for( pageNo = 0; pageNo < maxPages; pageNo++ ) @@ -505,7 +481,6 @@ bool SdPageObjsTLB::HasSelectedChildren( const OUString& rName ) return( bChildren ); } - /** * Fill TreeLB with pages and objects */ @@ -590,9 +565,6 @@ void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, SfxMedium* pInMedium, ); } - - - void SdPageObjsTLB::AddShapeList ( const SdrObjList& rList, SdrObject* pShape, @@ -809,9 +781,6 @@ void SdPageObjsTLB::AddShapeList ( } } - - - void SdPageObjsTLB::SetShowAllShapes ( const bool bShowAllShapes, const bool bFillList) @@ -826,13 +795,6 @@ void SdPageObjsTLB::SetShowAllShapes ( } } - - - - - - - /** * Checks if the pages (PK_STANDARD) of a doc and the objects on the pages * are identical to the TreeLB. @@ -1396,7 +1358,6 @@ sal_Int8 SdPageObjsTLB::ExecuteDrop( const ExecuteDropEvent& rEvt ) if (nRet == DND_ACTION_NONE) SvTreeListBox::ExecuteDrop(rEvt, this); - return nRet; } @@ -1411,7 +1372,6 @@ IMPL_STATIC_LINK(SdPageObjsTLB, ExecDragHdl, void*, EMPTYARG) return 0; } - bool SdPageObjsTLB::PageBelongsToCurrentShow (const SdPage* pPage) const { // Return <TRUE/> as default when there is no custom show or when none @@ -1524,9 +1484,6 @@ SvTreeListEntry* SdPageObjsTLB::GetDropTarget (const Point& rLocation) return pEntry; } - - - bool SdPageObjsTLB::IsDropAllowed (SvTreeListEntry* pEntry) { if (pEntry == NULL) @@ -1541,9 +1498,6 @@ bool SdPageObjsTLB::IsDropAllowed (SvTreeListEntry* pEntry) return true; } - - - void SdPageObjsTLB::AddShapeToTransferable ( SdTransferable& rTransferable, SdrObject& rObject) const @@ -1593,9 +1547,6 @@ void SdPageObjsTLB::AddShapeToTransferable ( rTransferable.SetObjectDescriptor( aObjectDescriptor ); } - - - ::sd::ViewShell* SdPageObjsTLB::GetViewShellForDocShell (::sd::DrawDocShell& rDocShell) { { @@ -1647,9 +1598,6 @@ void SdPageObjsTLB::AddShapeToTransferable ( return NULL; } - - - //===== IconProvider ========================================================== SdPageObjsTLB::IconProvider::IconProvider (void) diff --git a/sd/source/ui/dlg/tabtempl.cxx b/sd/source/ui/dlg/tabtempl.cxx index 1cd52db0578b..f8b5c2ea57da 100644 --- a/sd/source/ui/dlg/tabtempl.cxx +++ b/sd/source/ui/dlg/tabtempl.cxx @@ -28,7 +28,6 @@ #include <svx/svdmodel.hxx> #include <svl/cjkoptions.hxx> - #include <svx/dialogs.hrc> #include <svx/svxdlg.hxx> @@ -108,8 +107,6 @@ SdTabTemplateDlg::SdTabTemplateDlg( Window* pParent, nHatchingListState = CT_NONE; } - - void SdTabTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); @@ -175,8 +172,6 @@ void SdTabTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) } } - - const SfxItemSet* SdTabTemplateDlg::GetRefreshedSet() { SfxItemSet* pRet = GetInputSetImpl(); @@ -192,6 +187,4 @@ const SfxItemSet* SdTabTemplateDlg::GetRefreshedSet() return pRet; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index c5977b916e5c..300bc8f9cc87 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -92,7 +92,6 @@ SdActionDlg::SdActionDlg ( SetTabPage( pNewPage ); } - /** * Action-TabPage */ @@ -140,14 +139,10 @@ SdTPAction::SdTPAction(Window* pWindow, const SfxItemSet& rInAttrs) ClickActionHdl( this ); } - - SdTPAction::~SdTPAction() { } - - void SdTPAction::SetView( const ::sd::View* pSdView ) { mpView = pSdView; @@ -171,8 +166,6 @@ void SdTPAction::SetView( const ::sd::View* pSdView ) } } - - void SdTPAction::Construct() { // fill OLE-Actionlistbox @@ -263,8 +256,6 @@ void SdTPAction::Construct() } - - bool SdTPAction::FillItemSet( SfxItemSet* rAttrs ) { bool bModified = false; @@ -308,8 +299,6 @@ bool SdTPAction::FillItemSet( SfxItemSet* rAttrs ) return( bModified ); } - - void SdTPAction::Reset( const SfxItemSet* rAttrs ) { presentation::ClickAction eCA = presentation::ClickAction_NONE; @@ -357,14 +346,10 @@ void SdTPAction::Reset( const SfxItemSet* rAttrs ) m_pEdtSound->SaveValue(); } - - void SdTPAction::ActivatePage( const SfxItemSet& ) { } - - int SdTPAction::DeactivatePage( SfxItemSet* pPageSet ) { if( pPageSet ) @@ -373,16 +358,12 @@ int SdTPAction::DeactivatePage( SfxItemSet* pPageSet ) return( LEAVE_PAGE ); } - - SfxTabPage* SdTPAction::Create( Window* pWindow, const SfxItemSet& rAttrs ) { return( new SdTPAction( pWindow, rAttrs ) ); } - - void SdTPAction::UpdateTree() { if( !bTreeUpdated && mpDoc && mpDoc->GetDocSh() && mpDoc->GetDocSh()->GetMedium() ) @@ -393,8 +374,6 @@ void SdTPAction::UpdateTree() } } - - void SdTPAction::OpenFileDialog() { // Soundpreview only for interaction with sound @@ -462,7 +441,6 @@ void SdTPAction::OpenFileDialog() SFX2_RESSTR(STR_SFX_FILTERNAME_ALL), OUString("*.*")); - if( aFileDialog.Execute() == ERRCODE_NONE ) { aFile = aFileDialog.GetPath(); @@ -474,8 +452,6 @@ void SdTPAction::OpenFileDialog() } } - - IMPL_LINK_NOARG(SdTPAction, ClickSearchHdl) { OpenFileDialog(); @@ -483,8 +459,6 @@ IMPL_LINK_NOARG(SdTPAction, ClickSearchHdl) return( 0L ); } - - IMPL_LINK_NOARG(SdTPAction, ClickActionHdl) { presentation::ClickAction eCA = GetActualClickAction(); @@ -544,7 +518,6 @@ IMPL_LINK_NOARG(SdTPAction, ClickActionHdl) m_pBtnSeek->Hide(); break; - case presentation::ClickAction_DOCUMENT: m_pLbTree->Hide(); m_pLbOLEAction->Hide(); @@ -660,16 +633,12 @@ IMPL_LINK_NOARG(SdTPAction, ClickActionHdl) return( 0L ); } - - IMPL_LINK_NOARG(SdTPAction, SelectTreeHdl) { m_pEdtBookmark->SetText( m_pLbTree->GetSelectEntry() ); return( 0L ); } - - IMPL_LINK_NOARG(SdTPAction, CheckFileHdl) { OUString aFile( GetEditText() ); @@ -718,8 +687,6 @@ IMPL_LINK_NOARG(SdTPAction, CheckFileHdl) return( 0L ); } - - presentation::ClickAction SdTPAction::GetActualClickAction() { presentation::ClickAction eCA = presentation::ClickAction_NONE; @@ -730,8 +697,6 @@ presentation::ClickAction SdTPAction::GetActualClickAction() return( eCA ); } - - void SdTPAction::SetActualClickAction( presentation::ClickAction eCA ) { std::vector<com::sun::star::presentation::ClickAction>::const_iterator pIter = @@ -741,8 +706,6 @@ void SdTPAction::SetActualClickAction( presentation::ClickAction eCA ) m_pLbAction->SelectEntryPos( pIter-maCurrentActions.begin() ); } - - void SdTPAction::SetEditText( OUString const & rStr ) { presentation::ClickAction eCA = GetActualClickAction(); @@ -804,8 +767,6 @@ void SdTPAction::SetEditText( OUString const & rStr ) } } - - OUString SdTPAction::GetEditText( bool bFullDocDestination ) { OUString aStr; @@ -871,8 +832,6 @@ OUString SdTPAction::GetEditText( bool bFullDocDestination ) return( aStr ); } - - sal_uInt16 SdTPAction::GetClickActionSdResId( presentation::ClickAction eCA ) { switch( eCA ) diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index 254a13d0f7d1..273816f54b15 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -51,14 +51,10 @@ SdTpOptionsSnap::SdTpOptionsSnap( Window* pParent, const SfxItemSet& rInAttrs ) pSnapFrames->Show(); } - - SdTpOptionsSnap::~SdTpOptionsSnap() { } - - bool SdTpOptionsSnap::FillItemSet( SfxItemSet* rAttrs ) { SvxGridTabPage::FillItemSet(rAttrs); @@ -82,8 +78,6 @@ bool SdTpOptionsSnap::FillItemSet( SfxItemSet* rAttrs ) return true; } - - void SdTpOptionsSnap::Reset( const SfxItemSet* rAttrs ) { SvxGridTabPage::Reset(rAttrs); @@ -105,8 +99,6 @@ void SdTpOptionsSnap::Reset( const SfxItemSet* rAttrs ) pCbxRotate->GetClickHdl().Call(0); } - - SfxTabPage* SdTpOptionsSnap::Create( Window* pWindow, const SfxItemSet* rAttrs ) { @@ -128,14 +120,10 @@ SdTpOptionsContents::SdTpOptionsContents( Window* pParent, const SfxItemSet& rIn get( m_pCbxMoveOutline, "moveoutline"); } - - SdTpOptionsContents::~SdTpOptionsContents() { } - - bool SdTpOptionsContents::FillItemSet( SfxItemSet* rAttrs ) { bool bModified = false; @@ -158,8 +146,6 @@ bool SdTpOptionsContents::FillItemSet( SfxItemSet* rAttrs ) return( bModified ); } - - void SdTpOptionsContents::Reset( const SfxItemSet* rAttrs ) { SdOptionsContentsItem aOptsItem( (const SdOptionsContentsItem&) rAttrs-> @@ -179,8 +165,6 @@ void SdTpOptionsContents::Reset( const SfxItemSet* rAttrs ) m_pCbxHandlesBezier->SaveValue(); } - - SfxTabPage* SdTpOptionsContents::Create( Window* pWindow, const SfxItemSet* rAttrs ) { @@ -320,7 +304,6 @@ void SdTpOptionsMisc::ActivatePage( const SfxItemSet& rSet ) SetFieldUnit( *m_pMtrFldOriginalHeight, eFUnit, true ); m_pMtrFldOriginalHeight->SetValue( m_pMtrFldOriginalHeight->Normalize( nVal ), FUNIT_TWIP ); - if( nWidth != 0 && nHeight != 0 ) { m_pMtrFldInfo1->SetUnit( eFUnit ); @@ -338,8 +321,6 @@ void SdTpOptionsMisc::ActivatePage( const SfxItemSet& rSet ) } } - - int SdTpOptionsMisc::DeactivatePage( SfxItemSet* pActiveSet ) { // check parser @@ -362,8 +343,6 @@ int SdTpOptionsMisc::DeactivatePage( SfxItemSet* pActiveSet ) return( LEAVE_PAGE ); } - - bool SdTpOptionsMisc::FillItemSet( SfxItemSet* rAttrs ) { bool bModified = false; @@ -431,8 +410,6 @@ bool SdTpOptionsMisc::FillItemSet( SfxItemSet* rAttrs ) return( bModified ); } - - void SdTpOptionsMisc::Reset( const SfxItemSet* rAttrs ) { SdOptionsMiscItem aOptsItem( (const SdOptionsMiscItem&) rAttrs-> @@ -511,15 +488,12 @@ void SdTpOptionsMisc::Reset( const SfxItemSet* rAttrs ) UpdateCompatibilityControls (); } - - SfxTabPage* SdTpOptionsMisc::Create( Window* pWindow, const SfxItemSet* rAttrs ) { return( new SdTpOptionsMisc( pWindow, *rAttrs ) ); } - IMPL_LINK_NOARG(SdTpOptionsMisc, SelectMetricHdl_Impl) { sal_Int32 nPos = m_pLbMetric->GetSelectEntryPos(); @@ -535,7 +509,6 @@ IMPL_LINK_NOARG(SdTpOptionsMisc, SelectMetricHdl_Impl) return 0; } - void SdTpOptionsMisc::SetImpressMode (void) { #ifndef ENABLE_SDREMOTE_BLUETOOTH @@ -568,15 +541,11 @@ void SdTpOptionsMisc::SetDrawMode() m_pCbxUsePrinterMetrics->SetPosPixel (m_pCbxCompatibility->GetPosPixel()); } - - OUString SdTpOptionsMisc::GetScale( sal_Int32 nX, sal_Int32 nY ) { return OUString::number(nX) + OUString(TOKEN) + OUString::number(nY); } - - bool SdTpOptionsMisc::SetScale( const OUString& aScale, sal_Int32& rX, sal_Int32& rY ) { if( comphelper::string::getTokenCount(aScale, TOKEN) != 2 ) diff --git a/sd/source/ui/dlg/unchss.cxx b/sd/source/ui/dlg/unchss.cxx index 05a5f0220587..eb7f1334e2e2 100644 --- a/sd/source/ui/dlg/unchss.cxx +++ b/sd/source/ui/dlg/unchss.cxx @@ -31,10 +31,8 @@ #include "stlsheet.hxx" #include "glob.hrc" - TYPEINIT1(StyleSheetUndoAction, SdUndoAction); - StyleSheetUndoAction::StyleSheetUndoAction(SdDrawDocument* pTheDoc, SfxStyleSheet* pTheStyleSheet, const SfxItemSet* pTheNewItemSet) : @@ -94,7 +92,6 @@ StyleSheetUndoAction::StyleSheetUndoAction(SdDrawDocument* pTheDoc, aComment = aComment.replaceFirst("$", aName); } - void StyleSheetUndoAction::Undo() { SfxItemSet aNewSet( mpDoc->GetItemPool(), pOldSet->GetRanges() ); @@ -107,7 +104,6 @@ void StyleSheetUndoAction::Undo() pStyleSheet->Broadcast(SfxSimpleHint(SFX_HINT_DATACHANGED)); } - void StyleSheetUndoAction::Redo() { SfxItemSet aNewSet( mpDoc->GetItemPool(), pOldSet->GetRanges() ); @@ -120,14 +116,12 @@ void StyleSheetUndoAction::Redo() pStyleSheet->Broadcast(SfxSimpleHint(SFX_HINT_DATACHANGED)); } - StyleSheetUndoAction::~StyleSheetUndoAction() { delete pNewSet; delete pOldSet; } - OUString StyleSheetUndoAction::GetComment() const { return aComment; diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx index 8026286bc483..21f1a9eb114a 100644 --- a/sd/source/ui/dlg/vectdlg.cxx +++ b/sd/source/ui/dlg/vectdlg.cxx @@ -187,7 +187,6 @@ void SdVectorizeDlg::Calculate( Bitmap& rBmp, GDIMetaFile& rMtf ) AddTile( pRAcc, aNewMtf, nCountX * nTileX, nCountY * nTileY, nRestX, nRestY ); } - aTmp.ReleaseAccess( pRAcc ); for( size_t n = 0, nCount = rMtf.GetActionSize(); n < nCount; n++ ) diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx index 3f97097fd14c..f0e1518ca7d9 100644 --- a/sd/source/ui/docshell/docshel2.cxx +++ b/sd/source/ui/docshell/docshel2.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "DrawDocShell.hxx" #include <vcl/msgbox.hxx> #include <svx/svdpagv.hxx> @@ -278,7 +277,6 @@ Bitmap DrawDocShell::GetPagePreviewBitmap(SdPage* pPage, sal_uInt16 nMaxEdgePixe return aPreview; } - /** * Checks if the page exists. If so, we force the user to enter a not yet used * name. diff --git a/sd/source/ui/docshell/docshel3.cxx b/sd/source/ui/docshell/docshel3.cxx index a4b044f54d04..40abf39b2855 100644 --- a/sd/source/ui/docshell/docshel3.cxx +++ b/sd/source/ui/docshell/docshel3.cxx @@ -106,7 +106,6 @@ static void lcl_setLanguageForObj( SdrObject *pObj, LanguageType nLang, bool bLa } } - static void lcl_setLanguage( const SdDrawDocument *pDoc, const OUString &rLanguage, bool bLanguageNone = false ) { LanguageType nLang = SvtLanguageTable::GetLanguageType( rLanguage ); diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index e5892ae95e8b..b4c43625897a 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "DrawDocShell.hxx" #include <com/sun/star/document/PrinterIndependentLayout.hpp> #include <tools/urlobj.hxx> @@ -80,7 +79,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using ::sd::framework::FrameworkHelper; - namespace sd { /** @@ -272,7 +270,6 @@ bool DrawDocShell::Load( SfxMedium& rMedium ) SfxItemSet* pSet = rMedium.GetItemSet(); - if( pSet ) { if( ( SFX_ITEM_SET == pSet->GetItemState(SID_PREVIEW ) ) && ( (SfxBoolItem&) ( pSet->Get( SID_PREVIEW ) ) ).GetValue() ) @@ -357,7 +354,6 @@ bool DrawDocShell::LoadFrom( SfxMedium& rMedium ) ErrCode nError = ERRCODE_NONE; bool bRet = SdXMLFilter( rMedium, *this, true, SDXMLMODE_Organizer, SotStorage::GetVersion( rMedium.GetStorage() ) ).Import( nError ); - // tell SFX to change viewshell when in preview mode if( IsPreview() ) { @@ -647,7 +643,6 @@ bool DrawDocShell::SaveCompleted( const ::com::sun::star::uno::Reference< ::com: return bRet; } - SfxStyleSheetBasePool* DrawDocShell::GetStyleSheetPool() { return( (SfxStyleSheetBasePool*) mpDoc->GetStyleSheetPool() ); @@ -936,7 +931,6 @@ bool DrawDocShell::GetObjectIsmarked(const OUString& rBookmark) } delete pUnoDrawView; - if (pObj) { // Objekt einblenden und selektieren @@ -945,7 +939,6 @@ bool DrawDocShell::GetObjectIsmarked(const OUString& rBookmark) bUnMark = pDrViewSh->GetView()->IsObjMarked(pObj); - } } } @@ -1042,7 +1035,6 @@ bool DrawDocShell::GotoTreeBookmark(const OUString& rBookmark) } delete pUnoDrawView; - if (pObj) { // Objekt einblenden und selektieren @@ -1113,7 +1105,6 @@ bool DrawDocShell::SaveAsOwnFormat( SfxMedium& rMedium ) return SfxObjectShell::SaveAsOwnFormat(rMedium); } - void DrawDocShell::FillClass(SvGlobalName* pClassName, sal_uInt32* pFormat, OUString* , diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index bb8d48f9e181..a51d29dc10ef 100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "DrawDocShell.hxx" #include <vcl/svapp.hxx> diff --git a/sd/source/ui/docshell/grdocsh.cxx b/sd/source/ui/docshell/grdocsh.cxx index 8f095f4cf1e8..7fe6b4a9a7ca 100644 --- a/sd/source/ui/docshell/grdocsh.cxx +++ b/sd/source/ui/docshell/grdocsh.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <svx/svxids.hrc> #include <sfx2/app.hxx> #include <svl/srchitem.hxx> @@ -27,7 +26,6 @@ #include <sfx2/objface.hxx> - #include "app.hrc" #include "strings.hrc" #include "glob.hrc" @@ -73,7 +71,6 @@ GraphicDocShell::~GraphicDocShell() { } - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/docshell/sdclient.cxx b/sd/source/ui/docshell/sdclient.cxx index c75be23db533..575d3b21f297 100644 --- a/sd/source/ui/docshell/sdclient.cxx +++ b/sd/source/ui/docshell/sdclient.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "Client.hxx" #include <com/sun/star/embed/NoVisualAreaSizeException.hpp> #include <svx/svdoole2.hxx> @@ -38,7 +37,6 @@ using namespace com::sun::star; namespace sd { - Client::Client(SdrOle2Obj* pObj, ViewShell* pViewShell, ::Window* pWindow) : SfxInPlaceClient(pViewShell->GetViewShell(), pWindow, pObj->GetAspect() ), mpViewShell(pViewShell), @@ -54,7 +52,6 @@ Client::~Client() { } - /** * If IP active, then we get this request to increase the visible section of the * object. @@ -192,7 +189,6 @@ void Client::ViewChanged() } } - /** * Scroll object into visible area. */ diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueue.cxx b/sd/source/ui/framework/configuration/ChangeRequestQueue.cxx index 90a02bc37b58..4758f5ab828f 100644 --- a/sd/source/ui/framework/configuration/ChangeRequestQueue.cxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueue.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ChangeRequestQueue.hxx" namespace sd { namespace framework { diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx b/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx index 349b501ed395..a9fbae6a5d8f 100644 --- a/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx @@ -26,7 +26,6 @@ namespace sd { namespace framework { - /** The ChangeRequestQueue stores the pending requests for changes to the requested configuration. It is the task of the ChangeRequestQueueProcessor to process these requests. @@ -41,7 +40,6 @@ public: ChangeRequestQueue (void); }; - } } // end of namespace sd::framework #endif diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx index 3b0182e4b947..15a472007b5a 100644 --- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ChangeRequestQueueProcessor.hxx" #include "ConfigurationTracer.hxx" @@ -49,7 +48,6 @@ void TraceRequest (const Reference<XConfigurationChangeRequest>& rxRequest) } // end of anonymous namespace - namespace sd { namespace framework { ChangeRequestQueueProcessor::ChangeRequestQueueProcessor ( @@ -64,18 +62,12 @@ ChangeRequestQueueProcessor::ChangeRequestQueueProcessor ( { } - - - ChangeRequestQueueProcessor::~ChangeRequestQueueProcessor (void) { if (mnUserEventId != 0) Application::RemoveUserEvent(mnUserEventId); } - - - void ChangeRequestQueueProcessor::SetConfiguration ( const Reference<XConfiguration>& rxConfiguration) { @@ -85,9 +77,6 @@ void ChangeRequestQueueProcessor::SetConfiguration ( StartProcessing(); } - - - void ChangeRequestQueueProcessor::AddRequest ( const Reference<XConfigurationChangeRequest>& rxRequest) { @@ -108,9 +97,6 @@ void ChangeRequestQueueProcessor::AddRequest ( StartProcessing(); } - - - void ChangeRequestQueueProcessor::StartProcessing (void) { ::osl::MutexGuard aGuard (maMutex); @@ -125,9 +111,6 @@ void ChangeRequestQueueProcessor::StartProcessing (void) } } - - - IMPL_LINK(ChangeRequestQueueProcessor, ProcessEvent, void*, pUnused) { (void)pUnused; @@ -147,9 +130,6 @@ IMPL_LINK(ChangeRequestQueueProcessor, ProcessEvent, void*, pUnused) return 0; } - - - void ChangeRequestQueueProcessor::ProcessOneEvent (void) { ::osl::MutexGuard aGuard (maMutex); @@ -189,33 +169,23 @@ void ChangeRequestQueueProcessor::ProcessOneEvent (void) } } - - - bool ChangeRequestQueueProcessor::IsEmpty (void) const { return maQueue.empty(); } - - - void ChangeRequestQueueProcessor::ProcessUntilEmpty (void) { while ( ! IsEmpty()) ProcessOneEvent(); } - - - void ChangeRequestQueueProcessor::Clear (void) { ::osl::MutexGuard aGuard (maMutex); maQueue.clear(); } - } } // end of namespace sd::framework::configuration /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx index 33c5479f5fe7..d58b1a676422 100644 --- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx @@ -124,7 +124,6 @@ private: DECL_LINK(ProcessEvent,void*); }; - } } // end of namespace sd::framework #endif diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx index ace59d79e546..eb4c353a3746 100644 --- a/sd/source/ui/framework/configuration/Configuration.cxx +++ b/sd/source/ui/framework/configuration/Configuration.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "framework/Configuration.hxx" #include "framework/FrameworkHelper.hxx" @@ -45,12 +44,8 @@ public: } // end of anonymous namespace - - - namespace sd { namespace framework { - class Configuration::ResourceContainer : public ::std::set<Reference<XResourceId>, XResourceIdLess> { @@ -58,9 +53,6 @@ public: ResourceContainer (void) {} }; - - - //----- Service --------------------------------------------------------------- Reference<XInterface> SAL_CALL Configuration_createInstance ( @@ -70,17 +62,11 @@ Reference<XInterface> SAL_CALL Configuration_createInstance ( return Reference<XInterface>(static_cast<XWeak*>(new Configuration(NULL,false))); } - - - OUString Configuration_getImplementationName (void) throw(RuntimeException) { return OUString("com.sun.star.comp.Draw.framework.configuration.Configuration"); } - - - Sequence<OUString> SAL_CALL Configuration_getSupportedServiceNames (void) throw (RuntimeException) { @@ -88,9 +74,6 @@ Sequence<OUString> SAL_CALL Configuration_getSupportedServiceNames (void) return Sequence<OUString>(&sServiceName, 1); } - - - //===== Configuration ========================================================= Configuration::Configuration ( @@ -103,8 +86,6 @@ Configuration::Configuration ( { } - - Configuration::Configuration ( const Reference<XConfigurationControllerBroadcaster>& rxBroadcaster, bool bBroadcastRequestEvents, @@ -116,16 +97,10 @@ Configuration::Configuration ( { } - - - Configuration::~Configuration (void) { } - - - void SAL_CALL Configuration::disposing (void) { ::osl::MutexGuard aGuard (maMutex); @@ -133,9 +108,6 @@ void SAL_CALL Configuration::disposing (void) mxBroadcaster = NULL; } - - - //----- XConfiguration -------------------------------------------------------- void SAL_CALL Configuration::addResource (const Reference<XResourceId>& rxResourceId) @@ -156,9 +128,6 @@ void SAL_CALL Configuration::addResource (const Reference<XResourceId>& rxResour } } - - - void SAL_CALL Configuration::removeResource (const Reference<XResourceId>& rxResourceId) throw (RuntimeException, std::exception) { @@ -178,9 +147,6 @@ void SAL_CALL Configuration::removeResource (const Reference<XResourceId>& rxRes } } - - - Sequence<Reference<XResourceId> > SAL_CALL Configuration::getResources ( const Reference<XResourceId>& rxAnchorId, const OUString& rsResourceURLPrefix, @@ -202,7 +168,6 @@ Sequence<Reference<XResourceId> > SAL_CALL Configuration::getResources ( if ( ! (*iResource)->isBoundTo(rxAnchorId,eMode)) continue; - if (bFilterResources) { // Apply the given resource prefix as filter. @@ -232,9 +197,6 @@ Sequence<Reference<XResourceId> > SAL_CALL Configuration::getResources ( return aResult; } - - - sal_Bool SAL_CALL Configuration::hasResource (const Reference<XResourceId>& rxResourceId) throw (RuntimeException, std::exception) { @@ -245,9 +207,6 @@ sal_Bool SAL_CALL Configuration::hasResource (const Reference<XResourceId>& rxRe && mpResourceContainer->find(rxResourceId) != mpResourceContainer->end(); } - - - //----- XCloneable ------------------------------------------------------------ Reference<util::XCloneable> SAL_CALL Configuration::createClone (void) @@ -264,9 +223,6 @@ Reference<util::XCloneable> SAL_CALL Configuration::createClone (void) return Reference<util::XCloneable>(pConfiguration); } - - - //----- XNamed ---------------------------------------------------------------- OUString SAL_CALL Configuration::getName (void) @@ -293,21 +249,12 @@ OUString SAL_CALL Configuration::getName (void) return aString; } - - - void SAL_CALL Configuration::setName (const OUString& rsName) throw (RuntimeException, std::exception) { (void)rsName; // rsName is ignored. } - - - - - - void Configuration::PostEvent ( const Reference<XResourceId>& rxResourceId, const bool bActivation) @@ -334,9 +281,6 @@ void Configuration::PostEvent ( } } - - - void Configuration::ThrowIfDisposed (void) const throw (::com::sun::star::lang::DisposedException) { @@ -347,11 +291,6 @@ void Configuration::ThrowIfDisposed (void) const } } - - - - - bool AreConfigurationsEquivalent ( const Reference<XConfiguration>& rxConfiguration1, const Reference<XConfiguration>& rxConfiguration2) diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx index 855a6672bf72..d970b447efd6 100644 --- a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ConfigurationClassifier.hxx" #include "framework/FrameworkHelper.hxx" @@ -39,9 +38,6 @@ ConfigurationClassifier::ConfigurationClassifier ( { } - - - bool ConfigurationClassifier::Partition (void) { maC1minusC2.clear(); @@ -55,18 +51,6 @@ bool ConfigurationClassifier::Partition (void) return !maC1minusC2.empty() || !maC2minusC1.empty(); } - - - - - - - - - - - - void ConfigurationClassifier::PartitionResources ( const ::com::sun::star::uno::Sequence<Reference<XResourceId> >& rS1, const ::com::sun::star::uno::Sequence<Reference<XResourceId> >& rS2) @@ -100,9 +84,6 @@ void ConfigurationClassifier::PartitionResources ( } } - - - void ConfigurationClassifier::ClassifyResources ( const ::com::sun::star::uno::Sequence<Reference<XResourceId> >& rS1, const ::com::sun::star::uno::Sequence<Reference<XResourceId> >& rS2, @@ -146,9 +127,6 @@ void ConfigurationClassifier::ClassifyResources ( } } - - - void ConfigurationClassifier::CopyResources ( const ResourceIdVector& rSource, const Reference<XConfiguration>& rxConfiguration, @@ -184,7 +162,6 @@ void ConfigurationClassifier::CopyResources ( } } - void ConfigurationClassifier::TraceResourceIdVector ( const sal_Char* pMessage, const ResourceIdVector& rResources) const @@ -200,7 +177,6 @@ void ConfigurationClassifier::TraceResourceIdVector ( } } - } } // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx index d10093fa71f3..93340b7621a1 100644 --- a/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx @@ -149,7 +149,6 @@ private: ResourceIdVector& rS2minusS1, ResourceIdVector& rS1andS2); - /** Copy the resources given in rSource to the list of resources specified by rTarget. Resources bound to the ones in rSource, either directly or indirectly, are copied as well. diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx index 39ec23ee024b..f2ec304e48d3 100644 --- a/sd/source/ui/framework/configuration/ConfigurationController.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx @@ -51,17 +51,11 @@ Reference<XInterface> SAL_CALL ConfigurationController_createInstance ( return static_cast<XWeak*>(new ConfigurationController()); } - - - OUString ConfigurationController_getImplementationName (void) throw(RuntimeException) { return OUString("com.sun.star.comp.Draw.framework.configuration.ConfigurationController"); } - - - Sequence<OUString> SAL_CALL ConfigurationController_getSupportedServiceNames (void) throw (RuntimeException) { @@ -69,9 +63,6 @@ Sequence<OUString> SAL_CALL ConfigurationController_getSupportedServiceNames (vo return Sequence<OUString>(&sServiceName, 1); } - - - //----- ConfigurationController::Implementation ------------------------------- class ConfigurationController::Implementation @@ -114,9 +105,6 @@ public: sal_Int32 mnLockCount; }; - - - //===== ConfigurationController::Lock ========================================= ConfigurationController::Lock::Lock (const Reference<XConfigurationController>& rxController) @@ -128,18 +116,12 @@ ConfigurationController::Lock::Lock (const Reference<XConfigurationController>& mxController->lock(); } - - - ConfigurationController::Lock::~Lock (void) { if (mxController.is()) mxController->unlock(); } - - - //===== ConfigurationController =============================================== ConfigurationController::ConfigurationController (void) throw() @@ -153,7 +135,6 @@ ConfigurationController::~ConfigurationController (void) throw() { } - void SAL_CALL ConfigurationController::disposing (void) { if (mpImplementation.get() == NULL) @@ -186,9 +167,6 @@ void SAL_CALL ConfigurationController::disposing (void) mpImplementation.reset(); } - - - void ConfigurationController::ProcessEvent (void) { if (mpImplementation.get() != NULL) @@ -199,9 +177,6 @@ void ConfigurationController::ProcessEvent (void) } } - - - void ConfigurationController::RequestSynchronousUpdate (void) { if (mpImplementation.get() == NULL) @@ -211,9 +186,6 @@ void ConfigurationController::RequestSynchronousUpdate (void) mpImplementation->mpQueueProcessor->ProcessUntilEmpty(); } - - - //----- XConfigurationControllerBroadcaster ----------------------------------- void SAL_CALL ConfigurationController::addConfigurationChangeListener ( @@ -229,9 +201,6 @@ void SAL_CALL ConfigurationController::addConfigurationChangeListener ( mpImplementation->mpBroadcaster->AddListener(rxListener, rsEventType, rUserData); } - - - void SAL_CALL ConfigurationController::removeConfigurationChangeListener ( const Reference<XConfigurationChangeListener>& rxListener) throw (RuntimeException, std::exception) @@ -242,9 +211,6 @@ void SAL_CALL ConfigurationController::removeConfigurationChangeListener ( mpImplementation->mpBroadcaster->RemoveListener(rxListener); } - - - void SAL_CALL ConfigurationController::notifyEvent ( const ConfigurationChangeEvent& rEvent) throw (RuntimeException, std::exception) @@ -264,16 +230,12 @@ void SAL_CALL ConfigurationController::lock() ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); - ++mpImplementation->mnLockCount; if (mpImplementation->mpConfigurationUpdaterLock.get()==NULL) mpImplementation->mpConfigurationUpdaterLock = mpImplementation->mpConfigurationUpdater->GetLock(); } - - - void SAL_CALL ConfigurationController::unlock (void) throw (RuntimeException, std::exception) { @@ -290,9 +252,6 @@ void SAL_CALL ConfigurationController::unlock (void) mpImplementation->mpConfigurationUpdaterLock.reset(); } - - - void SAL_CALL ConfigurationController::requestResourceActivation ( const Reference<XResourceId>& rxResourceId, ResourceActivationMode eMode) @@ -352,9 +311,6 @@ void SAL_CALL ConfigurationController::requestResourceActivation ( } } - - - void SAL_CALL ConfigurationController::requestResourceDeactivation ( const Reference<XResourceId>& rxResourceId) throw (RuntimeException, std::exception) @@ -393,9 +349,6 @@ void SAL_CALL ConfigurationController::requestResourceDeactivation ( } } - - - Reference<XResource> SAL_CALL ConfigurationController::getResource ( const Reference<XResourceId>& rxResourceId) throw (RuntimeException, std::exception) @@ -408,9 +361,6 @@ Reference<XResource> SAL_CALL ConfigurationController::getResource ( return aDescriptor.mxResource; } - - - void SAL_CALL ConfigurationController::update (void) throw (RuntimeException, std::exception) { @@ -430,9 +380,6 @@ void SAL_CALL ConfigurationController::update (void) } } - - - sal_Bool SAL_CALL ConfigurationController::hasPendingRequests (void) throw (RuntimeException, std::exception) { @@ -442,10 +389,6 @@ sal_Bool SAL_CALL ConfigurationController::hasPendingRequests (void) return ! mpImplementation->mpQueueProcessor->IsEmpty(); } - - - - void SAL_CALL ConfigurationController::postChangeRequest ( const Reference<XConfigurationChangeRequest>& rxRequest) throw (RuntimeException, std::exception) @@ -456,9 +399,6 @@ void SAL_CALL ConfigurationController::postChangeRequest ( mpImplementation->mpQueueProcessor->AddRequest(rxRequest); } - - - Reference<XConfiguration> SAL_CALL ConfigurationController::getRequestedConfiguration (void) throw (RuntimeException, std::exception) { @@ -472,9 +412,6 @@ Reference<XConfiguration> SAL_CALL ConfigurationController::getRequestedConfigur return Reference<XConfiguration>(); } - - - Reference<XConfiguration> SAL_CALL ConfigurationController::getCurrentConfiguration (void) throw (RuntimeException, std::exception) { @@ -489,9 +426,6 @@ Reference<XConfiguration> SAL_CALL ConfigurationController::getCurrentConfigurat return Reference<XConfiguration>(); } - - - /** The given configuration is restored by generating the appropriate set of activation and deactivation requests. */ @@ -553,9 +487,6 @@ void SAL_CALL ConfigurationController::restoreConfiguration ( pLock.reset(); } - - - //----- XResourceFactoryManager ----------------------------------------------- void SAL_CALL ConfigurationController::addResourceFactory( @@ -568,9 +499,6 @@ void SAL_CALL ConfigurationController::addResourceFactory( mpImplementation->mpResourceFactoryContainer->AddFactory(sResourceURL, rxResourceFactory); } - - - void SAL_CALL ConfigurationController::removeResourceFactoryForURL( const OUString& sResourceURL) throw (RuntimeException, std::exception) @@ -580,9 +508,6 @@ void SAL_CALL ConfigurationController::removeResourceFactoryForURL( mpImplementation->mpResourceFactoryContainer->RemoveFactoryForURL(sResourceURL); } - - - void SAL_CALL ConfigurationController::removeResourceFactoryForReference( const Reference<XResourceFactory>& rxResourceFactory) throw (RuntimeException, std::exception) @@ -592,9 +517,6 @@ void SAL_CALL ConfigurationController::removeResourceFactoryForReference( mpImplementation->mpResourceFactoryContainer->RemoveFactoryForReference(rxResourceFactory); } - - - Reference<XResourceFactory> SAL_CALL ConfigurationController::getResourceFactory ( const OUString& sResourceURL) throw (RuntimeException, std::exception) @@ -605,9 +527,6 @@ Reference<XResourceFactory> SAL_CALL ConfigurationController::getResourceFactory return mpImplementation->mpResourceFactoryContainer->GetFactory(sResourceURL); } - - - //----- XInitialization ------------------------------------------------------- void SAL_CALL ConfigurationController::initialize (const Sequence<Any>& aArguments) @@ -663,16 +582,10 @@ ConfigurationController::Implementation::Implementation ( mpQueueProcessor->SetConfiguration(mxRequestedConfiguration); } - - - ConfigurationController::Implementation::~Implementation (void) { } - - - } } // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx index a5640f85fbb0..86a869ef7140 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ConfigurationControllerBroadcaster.hxx" #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/DisposedException.hpp> @@ -37,9 +36,6 @@ ConfigurationControllerBroadcaster::ConfigurationControllerBroadcaster ( { } - - - void ConfigurationControllerBroadcaster::AddListener( const Reference<XConfigurationChangeListener>& rxListener, const OUString& rsEventType, @@ -58,9 +54,6 @@ void ConfigurationControllerBroadcaster::AddListener( maListenerMap[rsEventType].push_back(aDescriptor); } - - - void ConfigurationControllerBroadcaster::RemoveListener( const Reference<XConfigurationChangeListener>& rxListener) { @@ -84,9 +77,6 @@ void ConfigurationControllerBroadcaster::RemoveListener( } } - - - void ConfigurationControllerBroadcaster::NotifyListeners ( const ListenerList& rList, const ConfigurationChangeEvent& rEvent) @@ -117,9 +107,6 @@ void ConfigurationControllerBroadcaster::NotifyListeners ( } } - - - void ConfigurationControllerBroadcaster::NotifyListeners (const ConfigurationChangeEvent& rEvent) { // Notify the specialized listeners. @@ -143,9 +130,6 @@ void ConfigurationControllerBroadcaster::NotifyListeners (const ConfigurationCha } } - - - void ConfigurationControllerBroadcaster::NotifyListeners ( const OUString& rsEventType, const Reference<XResourceId>& rxResourceId, @@ -164,10 +148,6 @@ void ConfigurationControllerBroadcaster::NotifyListeners ( } } - - - - void ConfigurationControllerBroadcaster::DisposeAndClear (void) { lang::EventObject aEvent; @@ -212,9 +192,6 @@ void ConfigurationControllerBroadcaster::DisposeAndClear (void) } } - - - } } // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx index ec2886e8eee7..35b9ae9a210a 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx @@ -131,9 +131,6 @@ private: const css::drawing::framework::ConfigurationChangeEvent& rEvent); }; - - - } } // end of namespace sd::framework #endif diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx index 547c45106edd..d7a04442539c 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ConfigurationControllerResourceManager.hxx" #include "ConfigurationControllerBroadcaster.hxx" #include "ResourceFactoryManager.hxx" @@ -44,16 +43,10 @@ ConfigurationControllerResourceManager::ConfigurationControllerResourceManager ( { } - - - ConfigurationControllerResourceManager::~ConfigurationControllerResourceManager (void) { } - - - ConfigurationControllerResourceManager::ResourceDescriptor ConfigurationControllerResourceManager::GetResource ( const Reference<XResourceId>& rxResourceId) @@ -66,9 +59,6 @@ ConfigurationControllerResourceManager::ResourceDescriptor return ResourceDescriptor(); } - - - void ConfigurationControllerResourceManager::ActivateResources ( const ::std::vector<Reference<XResourceId> >& rResources, const Reference<XConfiguration>& rxConfiguration) @@ -84,9 +74,6 @@ void ConfigurationControllerResourceManager::ActivateResources ( this, _1, rxConfiguration)); } - - - void ConfigurationControllerResourceManager::DeactivateResources ( const ::std::vector<Reference<XResourceId> >& rResources, const Reference<XConfiguration>& rxConfiguration) @@ -102,9 +89,6 @@ void ConfigurationControllerResourceManager::DeactivateResources ( this, _1, rxConfiguration)); } - - - /* In this method we do following steps. 1. Get the factory with which the resource will be created. 2. Create the resource. @@ -181,9 +165,6 @@ void ConfigurationControllerResourceManager::ActivateResource ( } } - - - /* In this method we do following steps. 1. Remove the resource from the URL->Object map of the configuration controller. @@ -262,9 +243,6 @@ void ConfigurationControllerResourceManager::DeactivateResource ( #endif } - - - void ConfigurationControllerResourceManager::AddResource ( const Reference<XResource>& rxResource, const Reference<XResourceFactory>& rxFactory) @@ -289,9 +267,6 @@ void ConfigurationControllerResourceManager::AddResource ( #endif } - - - ConfigurationControllerResourceManager::ResourceDescriptor ConfigurationControllerResourceManager::RemoveResource ( const Reference<XResourceId>& rxResourceId) @@ -316,9 +291,6 @@ ConfigurationControllerResourceManager::ResourceDescriptor return aDescriptor; } - - - //===== ConfigurationControllerResourceManager::ResourceComparator ============ bool ConfigurationControllerResourceManager::ResourceComparator::operator() ( @@ -333,9 +305,6 @@ bool ConfigurationControllerResourceManager::ResourceComparator::operator() ( return false; } - - - } } // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx index 9b00fd545f9a..cf671f25dcd4 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx @@ -129,7 +129,6 @@ private: const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId); }; - } } // end of namespace sd::framework #endif diff --git a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx index 24d0f1f1dd99..79770425b02d 100644 --- a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ConfigurationTracer.hxx" #include <cstdio> @@ -49,9 +48,6 @@ void ConfigurationTracer::TraceConfiguration ( #endif } - - - #ifdef DEBUG void ConfigurationTracer::TraceBoundResources ( const Reference<XConfiguration>& rxConfiguration, diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx index a63a4da0d37e..da4c32837918 100644 --- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ConfigurationUpdater.hxx" #include "ConfigurationTracer.hxx" #include "ConfigurationClassifier.hxx" @@ -46,7 +45,6 @@ static const sal_Int32 snNormalTimeoutCountThreshold (5); namespace sd { namespace framework { - //===== ConfigurationUpdaterLock ============================================== class ConfigurationUpdaterLock @@ -59,9 +57,6 @@ private: ConfigurationUpdater& mrUpdater; }; - - - //===== ConfigurationUpdater ================================================== ConfigurationUpdater::ConfigurationUpdater ( @@ -87,26 +82,17 @@ ConfigurationUpdater::ConfigurationUpdater ( SetControllerManager(rxControllerManager); } - - - ConfigurationUpdater::~ConfigurationUpdater (void) { maUpdateTimer.Stop(); } - - - void ConfigurationUpdater::SetControllerManager( const Reference<XControllerManager>& rxControllerManager) { mxControllerManager = rxControllerManager; } - - - void ConfigurationUpdater::RequestUpdate ( const Reference<XConfiguration>& rxRequestedConfiguration) { @@ -135,13 +121,6 @@ void ConfigurationUpdater::RequestUpdate ( } } - - - - - - - bool ConfigurationUpdater::IsUpdatePossible (void) { return ! mbUpdateBeingProcessed @@ -151,9 +130,6 @@ bool ConfigurationUpdater::IsUpdatePossible (void) && mxCurrentConfiguration.is(); } - - - void ConfigurationUpdater::UpdateConfiguration (void) { SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": UpdateConfiguration update"); @@ -219,9 +195,6 @@ void ConfigurationUpdater::UpdateConfiguration (void) SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": UpdateConfiguration end"); } - - - void ConfigurationUpdater::CleanRequestedConfiguration (void) { if (mxControllerManager.is()) @@ -241,9 +214,6 @@ void ConfigurationUpdater::CleanRequestedConfiguration (void) } } - - - void ConfigurationUpdater::CheckUpdateSuccess (void) { // When the two configurations differ then start the timer to call @@ -266,9 +236,6 @@ void ConfigurationUpdater::CheckUpdateSuccess (void) } } - - - void ConfigurationUpdater::UpdateCore (const ConfigurationClassifier& rClassifier) { try @@ -309,9 +276,6 @@ void ConfigurationUpdater::UpdateCore (const ConfigurationClassifier& rClassifie } } - - - void ConfigurationUpdater::CheckPureAnchors ( const Reference<XConfiguration>& rxConfiguration, vector<Reference<XResourceId> >& rResourcesToDeactivate) @@ -380,17 +344,11 @@ void ConfigurationUpdater::CheckPureAnchors ( } } - - - void ConfigurationUpdater::LockUpdates (void) { ++mnLockCount; } - - - void ConfigurationUpdater::UnlockUpdates (void) { --mnLockCount; @@ -400,25 +358,16 @@ void ConfigurationUpdater::UnlockUpdates (void) } } - - - ::boost::shared_ptr<ConfigurationUpdaterLock> ConfigurationUpdater::GetLock (void) { return ::boost::shared_ptr<ConfigurationUpdaterLock>(new ConfigurationUpdaterLock(*this)); } - - - void ConfigurationUpdater::SetUpdateBeingProcessed (bool bValue) { mbUpdateBeingProcessed = bValue; } - - - IMPL_LINK_NOARG(ConfigurationUpdater, TimeoutHandler) { OSL_TRACE("configuration update timer"); @@ -435,7 +384,6 @@ IMPL_LINK_NOARG(ConfigurationUpdater, TimeoutHandler) return 0; } - } } // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx index d4eba7c6e3d6..cb4dc58ba152 100644 --- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx +++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "GenericConfigurationChangeRequest.hxx" #include "framework/FrameworkHelper.hxx" @@ -26,7 +25,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; - namespace sd { namespace framework { GenericConfigurationChangeRequest::GenericConfigurationChangeRequest ( @@ -40,16 +38,10 @@ GenericConfigurationChangeRequest::GenericConfigurationChangeRequest ( throw ::com::sun::star::lang::IllegalArgumentException(); } - - - GenericConfigurationChangeRequest::~GenericConfigurationChangeRequest (void) throw() { } - - - void SAL_CALL GenericConfigurationChangeRequest::execute ( const Reference<XConfiguration>& rxConfiguration) throw (RuntimeException, std::exception) @@ -69,9 +61,6 @@ void SAL_CALL GenericConfigurationChangeRequest::execute ( } } - - - OUString SAL_CALL GenericConfigurationChangeRequest::getName (void) throw (RuntimeException, std::exception) { @@ -80,9 +69,6 @@ OUString SAL_CALL GenericConfigurationChangeRequest::getName (void) + FrameworkHelper::ResourceIdToString(mxResourceId); } - - - void SAL_CALL GenericConfigurationChangeRequest::setName (const OUString& rsName) throw (RuntimeException, std::exception) { diff --git a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx index 03c1ae8e743f..1eb507da9f30 100644 --- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx +++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx @@ -38,7 +38,6 @@ typedef ::cppu::WeakComponentImplHelper2 < } // end of anonymous namespace. - namespace sd { namespace framework { /** This implementation of the XConfigurationChangeRequest interface @@ -73,7 +72,6 @@ public: virtual ~GenericConfigurationChangeRequest (void) throw(); - // XConfigurationChangeOperation /** The requested configuration change is executed on the given @@ -88,7 +86,6 @@ public: com::sun::star::drawing::framework::XConfiguration>& rxConfiguration) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XNamed /** Return a human readable string representation. This is used for diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx index 90b1d4359508..7602b0847cdb 100644 --- a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx +++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ResourceFactoryManager.hxx" #include <tools/wldcrd.hxx> #include <com/sun/star/lang/IllegalArgumentException.hpp> @@ -49,9 +48,6 @@ ResourceFactoryManager::ResourceFactoryManager (const Reference<XControllerManag mxURLTransformer = util::URLTransformer::create(xContext); } - - - ResourceFactoryManager::~ResourceFactoryManager (void) { Reference<lang::XComponent> xComponent (mxURLTransformer, UNO_QUERY); @@ -59,9 +55,6 @@ ResourceFactoryManager::~ResourceFactoryManager (void) xComponent->dispose(); } - - - void ResourceFactoryManager::AddFactory ( const OUString& rsURL, const Reference<XResourceFactory>& rxFactory) @@ -97,9 +90,6 @@ void ResourceFactoryManager::AddFactory ( } } - - - void ResourceFactoryManager::RemoveFactoryForURL ( const OUString& rsURL) throw (RuntimeException) @@ -132,10 +122,6 @@ void ResourceFactoryManager::RemoveFactoryForURL ( } } - - - - void ResourceFactoryManager::RemoveFactoryForReference( const Reference<XResourceFactory>& rxFactory) throw (RuntimeException) @@ -168,9 +154,6 @@ void ResourceFactoryManager::RemoveFactoryForReference( maFactoryPatternList.erase(iNewEnd, maFactoryPatternList.end()); } - - - Reference<XResourceFactory> ResourceFactoryManager::GetFactory ( const OUString& rsCompleteURL) throw (RuntimeException) @@ -203,9 +186,6 @@ Reference<XResourceFactory> ResourceFactoryManager::GetFactory ( return xFactory; } - - - Reference<XResourceFactory> ResourceFactoryManager::FindFactory (const OUString& rsURLBase) throw (RuntimeException) { diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx index 37c74abcdbaf..904c2d3bfd8e 100644 --- a/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx +++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx @@ -115,7 +115,6 @@ private: throw (css::uno::RuntimeException); }; - } } // end of namespace sd::framework #endif diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx index a09a06d7df01..d862a53a75f0 100644 --- a/sd/source/ui/framework/configuration/ResourceId.cxx +++ b/sd/source/ui/framework/configuration/ResourceId.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "framework/ResourceId.hxx" #include "framework/FrameworkHelper.hxx" #include "tools/SdGlobalResourceContainer.hxx" @@ -51,17 +50,11 @@ Reference<XInterface> SAL_CALL ResourceId_createInstance ( return Reference<XInterface>(static_cast<XWeak*>(new ::sd::framework::ResourceId())); } - - - OUString ResourceId_getImplementationName (void) throw(RuntimeException) { return OUString("com.sun.star.comp.Draw.framework.ResourceId"); } - - - Sequence<OUString> SAL_CALL ResourceId_getSupportedServiceNames (void) throw (RuntimeException) { @@ -69,9 +62,6 @@ Sequence<OUString> SAL_CALL ResourceId_getSupportedServiceNames (void) return Sequence<OUString>(&sServiceName, 1); } - - - //===== ResourceId ============================================================ WeakReference<util::XURLTransformer> ResourceId::mxURLTransformerWeak; @@ -83,9 +73,6 @@ ResourceId::ResourceId (void) { } - - - ResourceId::ResourceId ( const std::vector<OUString>& rResourceURLs) : ResourceIdInterfaceBase(), @@ -95,9 +82,6 @@ ResourceId::ResourceId ( ParseResourceURL(); } - - - ResourceId::ResourceId ( const OUString& rsResourceURL) : ResourceIdInterfaceBase(), @@ -110,9 +94,6 @@ ResourceId::ResourceId ( ParseResourceURL(); } - - - ResourceId::ResourceId ( const OUString& rsResourceURL, const OUString& rsAnchorURL) @@ -125,9 +106,6 @@ ResourceId::ResourceId ( ParseResourceURL(); } - - - ResourceId::ResourceId ( const OUString& rsResourceURL, const OUString& rsFirstAnchorURL, @@ -143,17 +121,11 @@ ResourceId::ResourceId ( ParseResourceURL(); } - - - ResourceId::~ResourceId (void) { mpURL.reset(); } - - - OUString SAL_CALL ResourceId::getResourceURL (void) throw(com::sun::star::uno::RuntimeException, std::exception) @@ -164,9 +136,6 @@ OUString SAL_CALL return OUString(); } - - - util::URL SAL_CALL ResourceId::getFullResourceURL (void) throw(com::sun::star::uno::RuntimeException, std::exception) @@ -189,9 +158,6 @@ util::URL SAL_CALL return aURL; } - - - sal_Bool SAL_CALL ResourceId::hasAnchor (void) throw (RuntimeException, std::exception) @@ -199,9 +165,6 @@ sal_Bool SAL_CALL return maResourceURLs.size()>1; } - - - Reference<XResourceId> SAL_CALL ResourceId::getAnchor (void) throw (RuntimeException, std::exception) @@ -217,9 +180,6 @@ Reference<XResourceId> SAL_CALL return Reference<XResourceId>(rResourceId.get()); } - - - Sequence<OUString> SAL_CALL ResourceId::getAnchorURLs (void) throw (RuntimeException, std::exception) @@ -236,9 +196,6 @@ Sequence<OUString> SAL_CALL return Sequence<OUString>(); } - - - OUString SAL_CALL ResourceId::getResourceTypePrefix (void) throw (RuntimeException, std::exception) @@ -261,9 +218,6 @@ OUString SAL_CALL return OUString(); } - - - sal_Int16 SAL_CALL ResourceId::compareTo (const Reference<XResourceId>& rxResourceId) throw (RuntimeException, std::exception) @@ -301,9 +255,6 @@ sal_Int16 SAL_CALL return nResult; } - - - sal_Int16 ResourceId::CompareToLocalImplementation (const ResourceId& rId) const { sal_Int16 nResult (0); @@ -346,9 +297,6 @@ sal_Int16 ResourceId::CompareToLocalImplementation (const ResourceId& rId) const return nResult; } - - - sal_Int16 ResourceId::CompareToExternalImplementation (const Reference<XResourceId>& rxId) const { sal_Int16 nResult (0); @@ -394,9 +342,6 @@ sal_Int16 ResourceId::CompareToExternalImplementation (const Reference<XResource return nResult; } - - - sal_Bool SAL_CALL ResourceId::isBoundTo ( const Reference<XResourceId>& rxResourceId, @@ -425,9 +370,6 @@ sal_Bool SAL_CALL } } - - - sal_Bool SAL_CALL ResourceId::isBoundToURL ( const OUString& rsAnchorURL, @@ -437,9 +379,6 @@ sal_Bool SAL_CALL return IsBoundToAnchor(&rsAnchorURL, NULL, eMode); } - - - Reference<XResourceId> SAL_CALL ResourceId::clone (void) throw(RuntimeException, std::exception) @@ -447,9 +386,6 @@ Reference<XResourceId> SAL_CALL return new ResourceId(maResourceURLs); } - - - //----- XInitialization ------------------------------------------------------- void SAL_CALL ResourceId::initialize (const Sequence<Any>& aArguments) @@ -481,11 +417,6 @@ void SAL_CALL ResourceId::initialize (const Sequence<Any>& aArguments) ParseResourceURL(); } - - - - - /** When eMode is DIRECTLY then the anchor of the called object and the anchor represented by the given sequence of anchor URLs have to be identical. When eMode is RECURSIVE then the anchor of the called @@ -533,9 +464,6 @@ bool ResourceId::IsBoundToAnchor ( return true; } - - - bool ResourceId::IsBoundToAnchor ( const ::std::vector<OUString>& rAnchorURLs, AnchorBindingMode eMode) const @@ -564,9 +492,6 @@ bool ResourceId::IsBoundToAnchor ( return true; } - - - void ResourceId::ParseResourceURL (void) { ::osl::Guard< ::osl::Mutex > aGuard (::osl::Mutex::getGlobalMutex()); @@ -593,7 +518,6 @@ void ResourceId::ParseResourceURL (void) } } - } } // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/configuration/UpdateRequest.cxx b/sd/source/ui/framework/configuration/UpdateRequest.cxx index 3b47379c0269..332c8a25b5f6 100644 --- a/sd/source/ui/framework/configuration/UpdateRequest.cxx +++ b/sd/source/ui/framework/configuration/UpdateRequest.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "UpdateRequest.hxx" #include "framework/FrameworkHelper.hxx" @@ -26,7 +25,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; - namespace sd { namespace framework { UpdateRequest::UpdateRequest (void) @@ -35,16 +33,10 @@ UpdateRequest::UpdateRequest (void) { } - - - UpdateRequest::~UpdateRequest (void) throw() { } - - - void SAL_CALL UpdateRequest::execute (const Reference<XConfiguration>& rxConfiguration) throw (RuntimeException, std::exception) { @@ -53,18 +45,12 @@ void SAL_CALL UpdateRequest::execute (const Reference<XConfiguration>& rxConfigu // becomes empty. } - - - OUString SAL_CALL UpdateRequest::getName (void) throw (RuntimeException, std::exception) { return OUString("UpdateRequest"); } - - - void SAL_CALL UpdateRequest::setName (const OUString& rsName) throw (RuntimeException, std::exception) { diff --git a/sd/source/ui/framework/configuration/UpdateRequest.hxx b/sd/source/ui/framework/configuration/UpdateRequest.hxx index 283c1d9f38fa..b6461ae31205 100644 --- a/sd/source/ui/framework/configuration/UpdateRequest.hxx +++ b/sd/source/ui/framework/configuration/UpdateRequest.hxx @@ -26,7 +26,6 @@ #include <com/sun/star/drawing/framework/XConfiguration.hpp> #include <cppuhelper/compbase2.hxx> - namespace { typedef ::cppu::WeakComponentImplHelper2 < @@ -36,8 +35,6 @@ typedef ::cppu::WeakComponentImplHelper2 < } // end of anonymous namespace. - - namespace sd { namespace framework { /** This update request is used to request configuration updates @@ -56,7 +53,6 @@ public: UpdateRequest (void) throw(); virtual ~UpdateRequest (void) throw(); - // XConfigurationChangeOperation virtual void SAL_CALL execute ( @@ -64,7 +60,6 @@ public: com::sun::star::drawing::framework::XConfiguration>& rxConfiguration) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XNamed /** Return a human readable string representation. This is used for diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx index 3c7a2382f81a..5d3aa53ac941 100644 --- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "BasicPaneFactory.hxx" #include "facreg.hxx" @@ -33,7 +32,6 @@ #include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <boost/bind.hpp> - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -55,7 +53,6 @@ namespace { namespace sd { namespace framework { - /** Store URL, XPane reference and (local) PaneId for every pane factory that is registered at the PaneController. */ @@ -76,7 +73,6 @@ public: bool ComparePane (const Reference<XResource>& rxPane) { return mxPane==rxPane; } }; - class BasicPaneFactory::PaneContainer : public ::std::vector<PaneDescriptor> { @@ -84,25 +80,17 @@ public: PaneContainer (void) {} }; - - Reference<XInterface> SAL_CALL BasicPaneFactory_createInstance ( const Reference<XComponentContext>& rxContext) throw (css::uno::Exception) { return Reference<XInterface>(static_cast<XWeak*>(new BasicPaneFactory(rxContext))); } - - - OUString BasicPaneFactory_getImplementationName (void) throw(RuntimeException) { return OUString("com.sun.star.comp.Draw.framework.BasicPaneFactory"); } - - - Sequence<OUString> SAL_CALL BasicPaneFactory_getSupportedServiceNames (void) throw (RuntimeException) { @@ -110,9 +98,6 @@ Sequence<OUString> SAL_CALL BasicPaneFactory_getSupportedServiceNames (void) return Sequence<OUString>(&sServiceName, 1); } - - - //===== PaneFactory =========================================================== BasicPaneFactory::BasicPaneFactory ( @@ -125,17 +110,10 @@ BasicPaneFactory::BasicPaneFactory ( { } - - - - BasicPaneFactory::~BasicPaneFactory (void) { } - - - void SAL_CALL BasicPaneFactory::disposing (void) { Reference<XConfigurationController> xCC (mxConfigurationControllerWeak); @@ -162,9 +140,6 @@ void SAL_CALL BasicPaneFactory::disposing (void) } } - - - void SAL_CALL BasicPaneFactory::initialize (const Sequence<Any>& aArguments) throw (Exception, RuntimeException, std::exception) { @@ -244,9 +219,6 @@ void SAL_CALL BasicPaneFactory::initialize (const Sequence<Any>& aArguments) } } - - - //===== XPaneFactory ========================================================== Reference<XResource> SAL_CALL BasicPaneFactory::createResource ( @@ -314,10 +286,6 @@ Reference<XResource> SAL_CALL BasicPaneFactory::createResource ( return xPane; } - - - - void SAL_CALL BasicPaneFactory::releaseResource ( const Reference<XResource>& rxPane) throw (RuntimeException, std::exception) @@ -369,9 +337,6 @@ void SAL_CALL BasicPaneFactory::releaseResource ( } } - - - //===== XConfigurationChangeListener ========================================== void SAL_CALL BasicPaneFactory::notifyConfigurationChange ( @@ -381,9 +346,6 @@ void SAL_CALL BasicPaneFactory::notifyConfigurationChange ( // FIXME: nothing to do } - - - //===== lang::XEventListener ================================================== void SAL_CALL BasicPaneFactory::disposing ( @@ -411,11 +373,6 @@ void SAL_CALL BasicPaneFactory::disposing ( } } - - - - - Reference<XResource> BasicPaneFactory::CreateFrameWindowPane ( const Reference<XResourceId>& rxPaneId) { @@ -429,9 +386,6 @@ Reference<XResource> BasicPaneFactory::CreateFrameWindowPane ( return xPane; } - - - Reference<XResource> BasicPaneFactory::CreateFullScreenPane ( const Reference<XComponentContext>& rxComponentContext, const Reference<XResourceId>& rxPaneId) @@ -445,9 +399,6 @@ Reference<XResource> BasicPaneFactory::CreateFullScreenPane ( return xPane; } - - - Reference<XResource> BasicPaneFactory::CreateChildWindowPane ( const Reference<XResourceId>& rxPaneId, const PaneDescriptor& rDescriptor) @@ -502,7 +453,6 @@ void BasicPaneFactory::ThrowIfDisposed (void) const } } - } } // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.hxx b/sd/source/ui/framework/factories/BasicPaneFactory.hxx index e5a8ee042420..b7752de26b68 100644 --- a/sd/source/ui/framework/factories/BasicPaneFactory.hxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.hxx @@ -35,7 +35,6 @@ #include <boost/scoped_ptr.hpp> #include <boost/shared_ptr.hpp> - namespace { typedef ::cppu::WeakComponentImplHelper3 < @@ -46,7 +45,6 @@ typedef ::cppu::WeakComponentImplHelper3 < } // end of anonymous namespace. - namespace sd { class ViewShellBase; @@ -73,14 +71,12 @@ public: virtual void SAL_CALL disposing (void) SAL_OVERRIDE; - // XInitialization virtual void SAL_CALL initialize( const css::uno::Sequence<css::uno::Any>& aArguments) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XResourceFactory virtual css::uno::Reference<css::drawing::framework::XResource> @@ -93,14 +89,12 @@ public: const css::uno::Reference<css::drawing::framework::XResource>& rxPane) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( const css::drawing::framework::ConfigurationChangeEvent& rEvent) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // lang::XEventListener virtual void SAL_CALL disposing ( diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx index de217914d828..692fe6e1c64a 100644 --- a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx +++ b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "BasicToolBarFactory.hxx" #include "ViewTabBar.hxx" @@ -35,24 +34,17 @@ using namespace ::com::sun::star::drawing::framework; namespace sd { namespace framework { - Reference<XInterface> SAL_CALL BasicToolBarFactory_createInstance ( const Reference<XComponentContext>& rxContext) throw (css::uno::Exception) { return static_cast<XWeak*>(new BasicToolBarFactory(rxContext)); } - - - OUString BasicToolBarFactory_getImplementationName (void) throw(RuntimeException) { return OUString("com.sun.star.comp.Draw.framework.BasicToolBarFactory"); } - - - Sequence<OUString> SAL_CALL BasicToolBarFactory_getSupportedServiceNames (void) throw (RuntimeException) { @@ -60,10 +52,6 @@ Sequence<OUString> SAL_CALL BasicToolBarFactory_getSupportedServiceNames (void) return Sequence<OUString>(&sServiceName, 1); } - - - - //===== BasicToolBarFactory =================================================== BasicToolBarFactory::BasicToolBarFactory ( @@ -76,24 +64,15 @@ BasicToolBarFactory::BasicToolBarFactory ( (void)rxContext; } - - - BasicToolBarFactory::~BasicToolBarFactory (void) { } - - - void SAL_CALL BasicToolBarFactory::disposing (void) { Shutdown(); } - - - void BasicToolBarFactory::Shutdown (void) { mpViewShellBase = NULL; @@ -107,9 +86,6 @@ void BasicToolBarFactory::Shutdown (void) } } - - - //----- XInitialization ------------------------------------------------------- void SAL_CALL BasicToolBarFactory::initialize (const Sequence<Any>& aArguments) @@ -162,9 +138,6 @@ void SAL_CALL BasicToolBarFactory::initialize (const Sequence<Any>& aArguments) } } - - - //----- lang::XEventListener -------------------------------------------------- void SAL_CALL BasicToolBarFactory::disposing ( @@ -175,9 +148,6 @@ void SAL_CALL BasicToolBarFactory::disposing ( mxConfigurationController = NULL; } - - - //===== XPaneFactory ========================================================== Reference<XResource> SAL_CALL BasicToolBarFactory::createResource ( @@ -195,14 +165,9 @@ Reference<XResource> SAL_CALL BasicToolBarFactory::createResource ( else throw lang::IllegalArgumentException(); - return xToolBar; } - - - - void SAL_CALL BasicToolBarFactory::releaseResource ( const Reference<XResource>& rxToolBar) throw (RuntimeException, std::exception) @@ -214,9 +179,6 @@ void SAL_CALL BasicToolBarFactory::releaseResource ( xComponent->dispose(); } - - - void BasicToolBarFactory::ThrowIfDisposed (void) const throw (lang::DisposedException) { @@ -227,9 +189,6 @@ void BasicToolBarFactory::ThrowIfDisposed (void) const } } - - - } } // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx index 32932f13d87d..5442f4e19051 100644 --- a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx +++ b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx @@ -32,7 +32,6 @@ #include <cppuhelper/compbase3.hxx> #include <cppuhelper/basemutex.hxx> - namespace { typedef ::cppu::WeakComponentImplHelper3 < @@ -63,7 +62,6 @@ public: virtual void SAL_CALL disposing (void) SAL_OVERRIDE; - // ToolBarFactory virtual css::uno::Reference<com::sun::star::drawing::framework::XResource> SAL_CALL @@ -78,14 +76,12 @@ public: rxToolBar) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XInitialization virtual void SAL_CALL initialize( const css::uno::Sequence<com::sun::star::uno::Any>& aArguments) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // lang::XEventListener virtual void SAL_CALL disposing ( diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx index cd69eaa65a19..9bc89f120e1e 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.cxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "BasicViewFactory.hxx" #include "framework/ViewShellWrapper.hxx" @@ -51,27 +50,19 @@ using namespace ::com::sun::star::drawing::framework; using ::sd::framework::FrameworkHelper; - namespace sd { namespace framework { - Reference<XInterface> SAL_CALL BasicViewFactory_createInstance ( const Reference<XComponentContext>& rxContext) throw (css::uno::Exception) { return Reference<XInterface>(static_cast<XWeak*>(new BasicViewFactory(rxContext))); } - - - OUString BasicViewFactory_getImplementationName (void) throw(RuntimeException) { return OUString("com.sun.star.comp.Draw.framework.BasicViewFactory"); } - - - Sequence<OUString> SAL_CALL BasicViewFactory_getSupportedServiceNames (void) throw (RuntimeException) { @@ -79,9 +70,6 @@ Sequence<OUString> SAL_CALL BasicViewFactory_getSupportedServiceNames (void) return Sequence<OUString>(&sServiceName, 1); } - - - //===== ViewDescriptor ======================================================== class BasicViewFactory::ViewDescriptor @@ -96,10 +84,6 @@ public: { return rpDescriptor->mxView.get() == rxView.get(); } }; - - - - //===== BasicViewFactory::ViewShellContainer ================================== class BasicViewFactory::ViewShellContainer @@ -109,7 +93,6 @@ public: ViewShellContainer (void) {}; }; - class BasicViewFactory::ViewCache : public ::std::vector<boost::shared_ptr<ViewDescriptor> > { @@ -117,9 +100,6 @@ public: ViewCache (void) {}; }; - - - //===== ViewFactory =========================================================== BasicViewFactory::BasicViewFactory ( @@ -136,16 +116,10 @@ BasicViewFactory::BasicViewFactory ( (void)rxContext; } - - - BasicViewFactory::~BasicViewFactory (void) { } - - - void SAL_CALL BasicViewFactory::disposing (void) { // Disconnect from the frame view. @@ -174,9 +148,6 @@ void SAL_CALL BasicViewFactory::disposing (void) mpViewShellContainer.reset(); } - - - Reference<XResource> SAL_CALL BasicViewFactory::createResource ( const Reference<XResourceId>& rxViewId) throw(RuntimeException, IllegalArgumentException, WrappedTargetException, std::exception) @@ -233,9 +204,6 @@ Reference<XResource> SAL_CALL BasicViewFactory::createResource ( return xView; } - - - void SAL_CALL BasicViewFactory::releaseResource (const Reference<XResource>& rxView) throw(RuntimeException, std::exception) { @@ -287,9 +255,6 @@ void SAL_CALL BasicViewFactory::releaseResource (const Reference<XResource>& rxV } } - - - void SAL_CALL BasicViewFactory::initialize (const Sequence<Any>& aArguments) throw (Exception, RuntimeException, std::exception) { @@ -331,9 +296,6 @@ void SAL_CALL BasicViewFactory::initialize (const Sequence<Any>& aArguments) } } - - - ::boost::shared_ptr<BasicViewFactory::ViewDescriptor> BasicViewFactory::CreateView ( const Reference<XResourceId>& rxViewId, SfxViewFrame& rFrame, @@ -379,9 +341,6 @@ void SAL_CALL BasicViewFactory::initialize (const Sequence<Any>& aArguments) return pDescriptor; } - - - ::boost::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell ( const Reference<XResourceId>& rxViewId, SfxViewFrame& rFrame, @@ -461,9 +420,6 @@ void SAL_CALL BasicViewFactory::initialize (const Sequence<Any>& aArguments) return pViewShell; } - - - void BasicViewFactory::ReleaseView ( const ::boost::shared_ptr<ViewDescriptor>& rpDescriptor, bool bDoNotCache) @@ -503,9 +459,6 @@ void BasicViewFactory::ReleaseView ( } } - - - bool BasicViewFactory::IsCacheable (const ::boost::shared_ptr<ViewDescriptor>& rpDescriptor) { bool bIsCacheable (false); @@ -539,9 +492,6 @@ bool BasicViewFactory::IsCacheable (const ::boost::shared_ptr<ViewDescriptor>& r return bIsCacheable; } - - - ::boost::shared_ptr<BasicViewFactory::ViewDescriptor> BasicViewFactory::GetViewFromCache ( const Reference<XResourceId>& rxViewId, const Reference<XPane>& rxPane) @@ -582,9 +532,6 @@ bool BasicViewFactory::IsCacheable (const ::boost::shared_ptr<ViewDescriptor>& r return pDescriptor; } - - - void BasicViewFactory::ActivateCenterView ( const ::boost::shared_ptr<ViewDescriptor>& rpDescriptor) { diff --git a/sd/source/ui/framework/factories/BasicViewFactory.hxx b/sd/source/ui/framework/factories/BasicViewFactory.hxx index 761ee536b883..77a40a5f5461 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.hxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.hxx @@ -52,9 +52,6 @@ typedef ::cppu::WeakComponentImplHelper2 < } // end of anonymous namespace. - - - namespace sd { namespace framework { /** Factory for the frequently used standard views of the drawing framework: @@ -80,7 +77,6 @@ public: virtual void SAL_CALL disposing (void) SAL_OVERRIDE; - // XViewFactory virtual css::uno::Reference<css::drawing::framework::XResource> @@ -92,7 +88,6 @@ public: const css::uno::Reference<css::drawing::framework::XResource>& xView) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XInitialization virtual void SAL_CALL initialize( diff --git a/sd/source/ui/framework/factories/ChildWindowPane.cxx b/sd/source/ui/framework/factories/ChildWindowPane.cxx index 3a208ace6ecf..304574f3ea53 100644 --- a/sd/source/ui/framework/factories/ChildWindowPane.cxx +++ b/sd/source/ui/framework/factories/ChildWindowPane.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ChildWindowPane.hxx" #include "PaneDockingWindow.hxx" @@ -33,7 +32,6 @@ using namespace ::com::sun::star::drawing::framework; namespace sd { namespace framework { - SAL_WNODEPRECATED_DECLARATIONS_PUSH ChildWindowPane::ChildWindowPane ( const Reference<XResourceId>& rxPaneId, @@ -88,15 +86,10 @@ ChildWindowPane::ChildWindowPane ( } SAL_WNODEPRECATED_DECLARATIONS_POP - - ChildWindowPane::~ChildWindowPane (void) { } - - - void ChildWindowPane::Hide (void) { SfxViewFrame* pViewFrame = mrViewShellBase.GetViewFrame(); @@ -110,9 +103,6 @@ void ChildWindowPane::Hide (void) mxWindow = NULL; } - - - void SAL_CALL ChildWindowPane::disposing (void) { ::osl::MutexGuard aGuard (maMutex); @@ -128,9 +118,6 @@ void SAL_CALL ChildWindowPane::disposing (void) Pane::disposing(); } - - - ::Window* ChildWindowPane::GetWindow (void) { do @@ -196,9 +183,6 @@ void SAL_CALL ChildWindowPane::disposing (void) return mpWindow; } - - - Reference<awt::XWindow> SAL_CALL ChildWindowPane::getWindow (void) throw (RuntimeException, std::exception) { @@ -207,8 +191,6 @@ Reference<awt::XWindow> SAL_CALL ChildWindowPane::getWindow (void) return Pane::getWindow(); } - - IMPLEMENT_FORWARD_XINTERFACE2( ChildWindowPane, ChildWindowPaneInterfaceBase, @@ -218,9 +200,6 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( ChildWindowPaneInterfaceBase, Pane); - - - //----- XEventListener -------------------------------------------------------- void SAL_CALL ChildWindowPane::disposing (const lang::EventObject& rEvent) @@ -237,9 +216,6 @@ void SAL_CALL ChildWindowPane::disposing (const lang::EventObject& rEvent) } } - - - } } // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/factories/ChildWindowPane.hxx b/sd/source/ui/framework/factories/ChildWindowPane.hxx index a7d69c99863b..f244f61fcecc 100644 --- a/sd/source/ui/framework/factories/ChildWindowPane.hxx +++ b/sd/source/ui/framework/factories/ChildWindowPane.hxx @@ -39,7 +39,6 @@ typedef ::cppu::ImplInheritanceHelper1 < } // end of anonymous namespace. - namespace sd { class ViewShellBase; } namespace sd { namespace framework { @@ -85,7 +84,6 @@ public: DECLARE_XINTERFACE() DECLARE_XTYPEPROVIDER() - // XEventListener virtual void SAL_CALL disposing( diff --git a/sd/source/ui/framework/factories/FrameWindowPane.cxx b/sd/source/ui/framework/factories/FrameWindowPane.cxx index b6a878b5b581..dec2d0ee4ed2 100644 --- a/sd/source/ui/framework/factories/FrameWindowPane.cxx +++ b/sd/source/ui/framework/factories/FrameWindowPane.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "FrameWindowPane.hxx" using namespace ::com::sun::star; @@ -33,23 +32,16 @@ FrameWindowPane::FrameWindowPane ( { } - - - FrameWindowPane::~FrameWindowPane (void) throw() { } - - - sal_Bool SAL_CALL FrameWindowPane::isAnchorOnly (void) throw (RuntimeException, std::exception) { return false; } - } } // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/factories/FrameWindowPane.hxx b/sd/source/ui/framework/factories/FrameWindowPane.hxx index eb814a827ffe..7276ecc53c1b 100644 --- a/sd/source/ui/framework/factories/FrameWindowPane.hxx +++ b/sd/source/ui/framework/factories/FrameWindowPane.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/drawing/framework/XResourceId.hpp> - namespace sd { namespace framework { /** This subclass is not necessary anymore. We can remove it if that diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx index 5ab5f82d7230..105d557680d6 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.cxx +++ b/sd/source/ui/framework/factories/FullScreenPane.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "FullScreenPane.hxx" #include "ViewShellBase.hxx" #include <cppcanvas/vclfactory.hxx> @@ -36,7 +35,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; - namespace sd { namespace framework { FullScreenPane::FullScreenPane ( @@ -99,16 +97,10 @@ FullScreenPane::FullScreenPane ( mpWindow->GrabFocus(); } - - - FullScreenPane::~FullScreenPane (void) throw() { } - - - void SAL_CALL FullScreenPane::disposing (void) { // We have created the window pointed to by mpWindow, we delete it. @@ -124,13 +116,9 @@ void SAL_CALL FullScreenPane::disposing (void) mpWorkWindow.reset(); } - FrameWindowPane::disposing(); } - - - //----- XPane ----------------------------------------------------------------- sal_Bool SAL_CALL FullScreenPane::isVisible (void) @@ -144,9 +132,6 @@ sal_Bool SAL_CALL FullScreenPane::isVisible (void) return false; } - - - void SAL_CALL FullScreenPane::setVisible (const sal_Bool bIsVisible) throw (RuntimeException, std::exception) { @@ -158,9 +143,6 @@ void SAL_CALL FullScreenPane::setVisible (const sal_Bool bIsVisible) mpWorkWindow->Show(bIsVisible); } - - - Reference<css::accessibility::XAccessible> SAL_CALL FullScreenPane::getAccessible (void) throw (RuntimeException, std::exception) { @@ -172,9 +154,6 @@ Reference<css::accessibility::XAccessible> SAL_CALL FullScreenPane::getAccessibl return NULL; } - - - void SAL_CALL FullScreenPane::setAccessible ( const Reference<css::accessibility::XAccessible>& rxAccessible) throw (RuntimeException, std::exception) @@ -198,11 +177,6 @@ void SAL_CALL FullScreenPane::setAccessible ( } } - - - - - IMPL_LINK(FullScreenPane, WindowEventHandler, VclWindowEvent*, pEvent) { switch (pEvent->GetId()) @@ -221,9 +195,6 @@ IMPL_LINK(FullScreenPane, WindowEventHandler, VclWindowEvent*, pEvent) return 1; } - - - Reference<rendering::XCanvas> FullScreenPane::CreateCanvas (void) throw (RuntimeException) { @@ -250,9 +221,6 @@ Reference<rendering::XCanvas> FullScreenPane::CreateCanvas (void) throw RuntimeException(); } - - - void FullScreenPane::ExtractArguments ( const Reference<XResourceId>& rxPaneId, sal_Int32& rnScreenNumberReturnValue) @@ -278,7 +246,6 @@ void FullScreenPane::ExtractArguments ( } } - } } // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/factories/FullScreenPane.hxx b/sd/source/ui/framework/factories/FullScreenPane.hxx index b9a0c333a848..d90332759ea8 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.hxx +++ b/sd/source/ui/framework/factories/FullScreenPane.hxx @@ -71,9 +71,6 @@ public: const cssu::Reference<css::accessibility::XAccessible>& rxAccessible) throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; - - - DECL_LINK(WindowEventHandler, VclWindowEvent*); protected: diff --git a/sd/source/ui/framework/factories/Pane.cxx b/sd/source/ui/framework/factories/Pane.cxx index cb3583261b3d..5fea572a81ad 100644 --- a/sd/source/ui/framework/factories/Pane.cxx +++ b/sd/source/ui/framework/factories/Pane.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "framework/Pane.hxx" #include <vcl/svapp.hxx> @@ -31,7 +30,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; - namespace sd { namespace framework { Pane::Pane ( @@ -45,25 +43,16 @@ Pane::Pane ( { } - - - Pane::~Pane (void) { } - - - void Pane::disposing (void) { mxWindow = NULL; mpWindow = NULL; } - - - ::Window* Pane::GetWindow (void) { if (mxWindow.is()) @@ -72,10 +61,6 @@ void Pane::disposing (void) return NULL; } - - - - //----- XPane ----------------------------------------------------------------- Reference<awt::XWindow> SAL_CALL Pane::getWindow (void) @@ -86,9 +71,6 @@ Reference<awt::XWindow> SAL_CALL Pane::getWindow (void) return mxWindow; } - - - Reference<rendering::XCanvas> SAL_CALL Pane::getCanvas (void) throw (RuntimeException, std::exception) { @@ -101,9 +83,6 @@ Reference<rendering::XCanvas> SAL_CALL Pane::getCanvas (void) return mxCanvas; } - - - //----- XPane2 ---------------------------------------------------------------- sal_Bool SAL_CALL Pane::isVisible (void) @@ -118,9 +97,6 @@ sal_Bool SAL_CALL Pane::isVisible (void) return false; } - - - void SAL_CALL Pane::setVisible (sal_Bool bIsVisible) throw (RuntimeException, std::exception) { @@ -131,9 +107,6 @@ void SAL_CALL Pane::setVisible (sal_Bool bIsVisible) pWindow->Show(bIsVisible); } - - - Reference<css::accessibility::XAccessible> SAL_CALL Pane::getAccessible (void) throw (RuntimeException, std::exception) { @@ -145,9 +118,6 @@ Reference<css::accessibility::XAccessible> SAL_CALL Pane::getAccessible (void) return NULL; } - - - void SAL_CALL Pane::setAccessible ( const Reference<css::accessibility::XAccessible>& rxAccessible) throw (RuntimeException, std::exception) @@ -158,9 +128,6 @@ void SAL_CALL Pane::setAccessible ( pWindow->SetAccessible(rxAccessible); } - - - //----- XResource ------------------------------------------------------------- Reference<XResourceId> SAL_CALL Pane::getResourceId (void) @@ -171,18 +138,12 @@ Reference<XResourceId> SAL_CALL Pane::getResourceId (void) return mxPaneId; } - - - sal_Bool SAL_CALL Pane::isAnchorOnly (void) throw (RuntimeException, std::exception) { return true; } - - - //----- XUnoTunnel ------------------------------------------------------------ namespace @@ -209,11 +170,6 @@ sal_Int64 SAL_CALL Pane::getSomething (const Sequence<sal_Int8>& rId) return nResult; } - - - - - Reference<rendering::XCanvas> Pane::CreateCanvas (void) throw (RuntimeException) { @@ -230,9 +186,6 @@ Reference<rendering::XCanvas> Pane::CreateCanvas (void) return xCanvas; } - - - void Pane::ThrowIfDisposed (void) const throw (lang::DisposedException) { @@ -243,7 +196,6 @@ void Pane::ThrowIfDisposed (void) const } } - } } // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx b/sd/source/ui/framework/factories/PresentationFactory.cxx index 52892f876488..36269d28adc9 100644 --- a/sd/source/ui/framework/factories/PresentationFactory.cxx +++ b/sd/source/ui/framework/factories/PresentationFactory.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "framework/PresentationFactory.hxx" #include "framework/FrameworkHelper.hxx" @@ -36,7 +35,6 @@ using namespace ::com::sun::star::drawing::framework; using ::sd::framework::FrameworkHelper; - namespace sd { namespace framework { namespace { @@ -60,9 +58,6 @@ public: throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - - - typedef ::cppu::WeakComponentImplHelper1 <XView> PresentationViewInterfaceBase; /** The PresentationView is not an actual view, it is a marker whose @@ -86,16 +81,12 @@ public: virtual sal_Bool SAL_CALL isAnchorOnly (void) throw (RuntimeException, std::exception) SAL_OVERRIDE { return false; } - private: Reference<XResourceId> mxResourceId; }; } // end of anonymous namespace. - - - //===== PresentationFactoryProvider service =================================== Reference<XInterface> SAL_CALL PresentationFactoryProvider_createInstance ( @@ -104,17 +95,11 @@ Reference<XInterface> SAL_CALL PresentationFactoryProvider_createInstance ( return Reference<XInterface>(static_cast<XWeak*>(new PresentationFactoryProvider(rxContext))); } - - - OUString PresentationFactoryProvider_getImplementationName (void) throw(RuntimeException) { return OUString("com.sun.star.comp.Draw.framework.PresentationFactoryProvider"); } - - - Sequence<OUString> SAL_CALL PresentationFactoryProvider_getSupportedServiceNames (void) throw (RuntimeException) { @@ -122,14 +107,10 @@ Sequence<OUString> SAL_CALL PresentationFactoryProvider_getSupportedServiceNames return Sequence<OUString>(&sServiceName, 1); } - - - //===== PresentationFactory =================================================== const OUString PresentationFactory::msPresentationViewURL("private:resource/view/Presentation"); - PresentationFactory::PresentationFactory ( const Reference<frame::XController>& rxController) : PresentationFactoryInterfaceBase(MutexOwner::maMutex), @@ -148,24 +129,14 @@ PresentationFactory::PresentationFactory ( } } - - - - PresentationFactory::~PresentationFactory (void) { } - - - void SAL_CALL PresentationFactory::disposing (void) { } - - - //----- XViewFactory ---------------------------------------------------------- Reference<XResource> SAL_CALL PresentationFactory::createResource ( @@ -181,9 +152,6 @@ Reference<XResource> SAL_CALL PresentationFactory::createResource ( return Reference<XResource>(); } - - - void SAL_CALL PresentationFactory::releaseResource ( const Reference<XResource>& rxView) throw (RuntimeException, std::exception) @@ -205,9 +173,6 @@ void SAL_CALL PresentationFactory::releaseResource ( } } - - - //===== XConfigurationChangeListener ========================================== void SAL_CALL PresentationFactory::notifyConfigurationChange ( @@ -217,9 +182,6 @@ void SAL_CALL PresentationFactory::notifyConfigurationChange ( (void)rEvent; } - - - //===== lang::XEventListener ================================================== void SAL_CALL PresentationFactory::disposing ( @@ -229,12 +191,6 @@ void SAL_CALL PresentationFactory::disposing ( (void)rEventObject; } - - - - - - void PresentationFactory::ThrowIfDisposed (void) const throw (lang::DisposedException) { @@ -245,8 +201,6 @@ void PresentationFactory::ThrowIfDisposed (void) const } } - - namespace { //===== PresentationFactoryProvider =========================================== @@ -258,23 +212,14 @@ PresentationFactoryProvider::PresentationFactoryProvider ( (void)rxContext; } - - - PresentationFactoryProvider::~PresentationFactoryProvider (void) { } - - - void PresentationFactoryProvider::disposing (void) { } - - - // XInitialization void SAL_CALL PresentationFactoryProvider::initialize( @@ -301,11 +246,8 @@ void SAL_CALL PresentationFactoryProvider::initialize( } } - - } // end of anonymous namespace. - } } // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx index a67d146438d1..867737c021f0 100644 --- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx +++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "framework/ViewShellWrapper.hxx" #include "framework/Pane.hxx" #include "sdpage.hxx" @@ -45,7 +44,6 @@ #include <osl/mutex.hxx> #include <tools/diagnose_ex.h> - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; @@ -54,7 +52,6 @@ using ::com::sun::star::awt::XWindow; using ::com::sun::star::rendering::XCanvas; using ::com::sun::star::lang::DisposedException; - namespace sd { namespace framework { ViewShellWrapper::ViewShellWrapper ( @@ -70,16 +67,10 @@ ViewShellWrapper::ViewShellWrapper ( { } - - - ViewShellWrapper::~ViewShellWrapper (void) { } - - - void SAL_CALL ViewShellWrapper::disposing (void) { ::osl::MutexGuard aGuard( maMutex ); @@ -111,12 +102,6 @@ uno::Any SAL_CALL ViewShellWrapper::queryInterface( const uno::Type & rType ) th return ViewShellWrapperInterfaceBase::queryInterface( rType ); } - - - - - - //----- XResource ------------------------------------------------------------- Reference<XResourceId> SAL_CALL ViewShellWrapper::getResourceId (void) @@ -125,16 +110,12 @@ Reference<XResourceId> SAL_CALL ViewShellWrapper::getResourceId (void) return mxViewId; } - - - sal_Bool SAL_CALL ViewShellWrapper::isAnchorOnly (void) throw (RuntimeException, std::exception) { return false; } - //----- XSelectionSupplier -------------------------------------------------- sal_Bool SAL_CALL ViewShellWrapper::select( const ::com::sun::star::uno::Any& aSelection ) throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) @@ -207,7 +188,6 @@ void SAL_CALL ViewShellWrapper::removeSelectionChangeListener( const uno::Refere { } - //----- XRelocatableResource -------------------------------------------------- sal_Bool SAL_CALL ViewShellWrapper::relocateToAnchor ( @@ -246,9 +226,6 @@ sal_Bool SAL_CALL ViewShellWrapper::relocateToAnchor ( return bResult; } - - - //----- XUnoTunnel ------------------------------------------------------------ namespace @@ -261,9 +238,6 @@ const Sequence<sal_Int8>& ViewShellWrapper::getUnoTunnelId (void) return theViewShellWrapperUnoTunnelId::get().getSeq(); } - - - sal_Int64 SAL_CALL ViewShellWrapper::getSomething (const Sequence<sal_Int8>& rId) throw (RuntimeException, std::exception) { @@ -278,9 +252,6 @@ sal_Int64 SAL_CALL ViewShellWrapper::getSomething (const Sequence<sal_Int8>& rId return nResult; } - - - //===== awt::XWindowListener ================================================== void SAL_CALL ViewShellWrapper::windowResized (const awt::WindowEvent& rEvent) @@ -292,18 +263,12 @@ void SAL_CALL ViewShellWrapper::windowResized (const awt::WindowEvent& rEvent) pViewShell->Resize(); } - - - void SAL_CALL ViewShellWrapper::windowMoved (const awt::WindowEvent& rEvent) throw (RuntimeException, std::exception) { (void)rEvent; } - - - void SAL_CALL ViewShellWrapper::windowShown (const lang::EventObject& rEvent) throw (RuntimeException, std::exception) { @@ -313,18 +278,12 @@ void SAL_CALL ViewShellWrapper::windowShown (const lang::EventObject& rEvent) pViewShell->Resize(); } - - - void SAL_CALL ViewShellWrapper::windowHidden (const lang::EventObject& rEvent) throw (RuntimeException, std::exception) { (void)rEvent; } - - - //===== XEventListener ======================================================== void SAL_CALL ViewShellWrapper::disposing (const lang::EventObject& rEvent) @@ -334,7 +293,6 @@ void SAL_CALL ViewShellWrapper::disposing (const lang::EventObject& rEvent) mxWindow = NULL; } - } } // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.cxx b/sd/source/ui/framework/module/CenterViewFocusModule.cxx index faba6d580217..a84ded03f401 100644 --- a/sd/source/ui/framework/module/CenterViewFocusModule.cxx +++ b/sd/source/ui/framework/module/CenterViewFocusModule.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "CenterViewFocusModule.hxx" #include "framework/ConfigurationController.hxx" @@ -41,7 +40,6 @@ using namespace ::com::sun::star::drawing::framework; using ::sd::framework::FrameworkHelper; - namespace sd { namespace framework { //===== CenterViewFocusModule ==================================================== @@ -88,16 +86,10 @@ CenterViewFocusModule::CenterViewFocusModule (Reference<frame::XController>& rxC } } - - - CenterViewFocusModule::~CenterViewFocusModule (void) { } - - - void SAL_CALL CenterViewFocusModule::disposing (void) { if (mxConfigurationController.is()) @@ -108,9 +100,6 @@ void SAL_CALL CenterViewFocusModule::disposing (void) mpBase = NULL; } - - - void SAL_CALL CenterViewFocusModule::notifyConfigurationChange ( const ConfigurationChangeEvent& rEvent) throw (RuntimeException, std::exception) @@ -129,9 +118,6 @@ void SAL_CALL CenterViewFocusModule::notifyConfigurationChange ( } } - - - void CenterViewFocusModule::HandleNewView ( const Reference<XConfiguration>& rxConfiguration) { @@ -164,9 +150,6 @@ void CenterViewFocusModule::HandleNewView ( } } - - - void SAL_CALL CenterViewFocusModule::disposing ( const lang::EventObject& rEvent) throw (RuntimeException, std::exception) @@ -180,8 +163,6 @@ void SAL_CALL CenterViewFocusModule::disposing ( } } - - } } // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.hxx b/sd/source/ui/framework/module/CenterViewFocusModule.hxx index a3a2ef388226..d1ff8eba52e2 100644 --- a/sd/source/ui/framework/module/CenterViewFocusModule.hxx +++ b/sd/source/ui/framework/module/CenterViewFocusModule.hxx @@ -28,7 +28,6 @@ #include <osl/mutex.hxx> #include <cppuhelper/compbase1.hxx> - namespace { typedef ::cppu::WeakComponentImplHelper1 < @@ -43,9 +42,6 @@ class ViewShellBase; } - - - namespace sd { namespace framework { /** This module waits for new views to be created for the center pane and @@ -64,7 +60,6 @@ public: virtual void SAL_CALL disposing (void) SAL_OVERRIDE; - // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( diff --git a/sd/source/ui/framework/module/DrawModule.cxx b/sd/source/ui/framework/module/DrawModule.cxx index 70232348a91d..a0babd6e2950 100644 --- a/sd/source/ui/framework/module/DrawModule.cxx +++ b/sd/source/ui/framework/module/DrawModule.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "framework/DrawModule.hxx" #include "framework/FrameworkHelper.hxx" @@ -28,12 +27,8 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; - - namespace sd { namespace framework { - - void DrawModule::Initialize (Reference<frame::XController>& rxController) { new sd::framework::CenterViewFocusModule(rxController); @@ -43,7 +38,6 @@ void DrawModule::Initialize (Reference<frame::XController>& rxController) new ToolBarModule(rxController); } - } } // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/module/ImpressModule.cxx b/sd/source/ui/framework/module/ImpressModule.cxx index 5986e0ab4e32..2c240d8ed131 100644 --- a/sd/source/ui/framework/module/ImpressModule.cxx +++ b/sd/source/ui/framework/module/ImpressModule.cxx @@ -32,7 +32,6 @@ using namespace ::com::sun::star::uno; namespace sd { namespace framework { - void ImpressModule::Initialize (Reference<frame::XController>& rxController) { new CenterViewFocusModule(rxController); @@ -51,7 +50,6 @@ void ImpressModule::Initialize (Reference<frame::XController>& rxController) new ShellStackGuard(rxController); } - } } // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx index 88b9b176ad9c..5d18ca658d44 100644 --- a/sd/source/ui/framework/module/ModuleController.cxx +++ b/sd/source/ui/framework/module/ModuleController.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "framework/ModuleController.hxx" #include "tools/ConfigurationAccess.hxx" @@ -39,9 +38,6 @@ namespace sd { namespace framework { static const sal_uInt32 snFactoryPropertyCount (2); static const sal_uInt32 snStartupPropertyCount (1); - - - class ModuleController::ResourceToFactoryMap : public ::boost::unordered_map< OUString, @@ -52,7 +48,6 @@ public: ResourceToFactoryMap (void) {} }; - class ModuleController::LoadedFactoryContainer : public ::boost::unordered_map< OUString, @@ -63,10 +58,6 @@ public: LoadedFactoryContainer (void) {} }; - - - - Reference<XInterface> SAL_CALL ModuleController_createInstance ( const Reference<XComponentContext>& rxContext) throw (css::uno::Exception, std::exception) @@ -74,17 +65,11 @@ Reference<XInterface> SAL_CALL ModuleController_createInstance ( return Reference<XInterface>(ModuleController::CreateInstance(rxContext), UNO_QUERY); } - - - OUString ModuleController_getImplementationName (void) throw(RuntimeException) { return OUString("com.sun.star.comp.Draw.framework.module.ModuleController"); } - - - Sequence<OUString> SAL_CALL ModuleController_getSupportedServiceNames (void) throw (RuntimeException) { @@ -114,9 +99,6 @@ ModuleController::~ModuleController (void) throw() { } - - - void SAL_CALL ModuleController::disposing (void) { // Break the cyclic reference back to DrawController object @@ -125,9 +107,6 @@ void SAL_CALL ModuleController::disposing (void) mxController.clear(); } - - - void ModuleController::LoadFactories (const Reference<XComponentContext>& rxContext) { try @@ -153,9 +132,6 @@ void ModuleController::LoadFactories (const Reference<XComponentContext>& rxCont } } - - - void ModuleController::ProcessFactory (const ::std::vector<Any>& rValues) { OSL_ASSERT(rValues.size() == snFactoryPropertyCount); @@ -185,9 +161,6 @@ void ModuleController::ProcessFactory (const ::std::vector<Any>& rValues) } } - - - void ModuleController::InstantiateStartupServices (void) { try @@ -211,9 +184,6 @@ void ModuleController::InstantiateStartupServices (void) } } - - - void ModuleController::ProcessStartupService (const ::std::vector<Any>& rValues) { OSL_ASSERT(rValues.size() == snStartupPropertyCount); @@ -246,9 +216,6 @@ void ModuleController::ProcessStartupService (const ::std::vector<Any>& rValues) } } - - - //----- XModuleController ----------------------------------------------------- void SAL_CALL ModuleController::requestResource (const OUString& rsResourceURL) @@ -293,9 +260,6 @@ void SAL_CALL ModuleController::requestResource (const OUString& rsResourceURL) } } - - - //----- XInitialization ------------------------------------------------------- void SAL_CALL ModuleController::initialize (const Sequence<Any>& aArguments) @@ -315,7 +279,6 @@ void SAL_CALL ModuleController::initialize (const Sequence<Any>& aArguments) } } - } } // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/module/PresentationModule.cxx b/sd/source/ui/framework/module/PresentationModule.cxx index 338337e049d2..4c05c227648b 100644 --- a/sd/source/ui/framework/module/PresentationModule.cxx +++ b/sd/source/ui/framework/module/PresentationModule.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "framework/PresentationModule.hxx" #include "CenterViewFocusModule.hxx" @@ -28,13 +27,11 @@ using namespace ::com::sun::star::uno; namespace sd { namespace framework { - void PresentationModule::Initialize (Reference<frame::XController>& rxController) { new sd::framework::CenterViewFocusModule(rxController); } - } } // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/module/ResourceManager.cxx b/sd/source/ui/framework/module/ResourceManager.cxx index 62bf57a7d969..e991df0cb3b4 100644 --- a/sd/source/ui/framework/module/ResourceManager.cxx +++ b/sd/source/ui/framework/module/ResourceManager.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ResourceManager.hxx" #include "framework/FrameworkHelper.hxx" @@ -37,9 +36,6 @@ namespace { static const sal_Int32 ResourceDeactivationRequestEvent = 1; } - - - namespace sd { namespace framework { class ResourceManager::MainViewContainer @@ -49,9 +45,6 @@ public: MainViewContainer (void) {} }; - - - //===== ResourceManager ======================================================= ResourceManager::ResourceManager ( @@ -87,16 +80,10 @@ ResourceManager::ResourceManager ( } } - - - ResourceManager::~ResourceManager (void) { } - - - void ResourceManager::AddActiveMainView ( const OUString& rsMainViewURL) { @@ -178,9 +165,6 @@ void SAL_CALL ResourceManager::notifyConfigurationChange ( } } - - - void ResourceManager::UpdateForMainViewShell (void) { if (mxConfigurationController.is()) @@ -205,9 +189,6 @@ void ResourceManager::UpdateForMainViewShell (void) } } - - - void ResourceManager::HandleMainViewSwitch ( const OUString& rsViewURL, const Reference<XConfiguration>& rxConfiguration, @@ -221,9 +202,6 @@ void ResourceManager::HandleMainViewSwitch ( UpdateForMainViewShell(); } - - - void ResourceManager::HandleResourceRequest( bool bActivation, const Reference<XConfiguration>& rxConfiguration) @@ -248,9 +226,6 @@ void ResourceManager::HandleResourceRequest( } } - - - void SAL_CALL ResourceManager::disposing ( const lang::EventObject& rEvent) throw (RuntimeException, std::exception) diff --git a/sd/source/ui/framework/module/ResourceManager.hxx b/sd/source/ui/framework/module/ResourceManager.hxx index b7a321b3d73f..1ce16db74410 100644 --- a/sd/source/ui/framework/module/ResourceManager.hxx +++ b/sd/source/ui/framework/module/ResourceManager.hxx @@ -35,7 +35,6 @@ typedef ::cppu::WeakComponentImplHelper1 < } // end of anonymous namespace. - namespace sd { namespace framework { /** Manage the activation state of one resource depending on the view in the diff --git a/sd/source/ui/framework/module/ShellStackGuard.cxx b/sd/source/ui/framework/module/ShellStackGuard.cxx index d9521cfecc4a..de8ecb3e4478 100644 --- a/sd/source/ui/framework/module/ShellStackGuard.cxx +++ b/sd/source/ui/framework/module/ShellStackGuard.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ShellStackGuard.hxx" #include "framework/ConfigurationController.hxx" @@ -35,7 +34,6 @@ using namespace ::com::sun::star::drawing::framework; using ::sd::framework::FrameworkHelper; - namespace sd { namespace framework { //===== CenterViewFocusModule ==================================================== @@ -78,16 +76,10 @@ ShellStackGuard::ShellStackGuard (Reference<frame::XController>& rxController) } } - - - ShellStackGuard::~ShellStackGuard (void) { } - - - void SAL_CALL ShellStackGuard::disposing (void) { if (mxConfigurationController.is()) @@ -97,9 +89,6 @@ void SAL_CALL ShellStackGuard::disposing (void) mpBase = NULL; } - - - void SAL_CALL ShellStackGuard::notifyConfigurationChange ( const ConfigurationChangeEvent& rEvent) throw (RuntimeException, std::exception) @@ -117,9 +106,6 @@ void SAL_CALL ShellStackGuard::notifyConfigurationChange ( } } - - - void SAL_CALL ShellStackGuard::disposing ( const lang::EventObject& rEvent) throw (RuntimeException, std::exception) @@ -132,9 +118,6 @@ void SAL_CALL ShellStackGuard::disposing ( } } - - - IMPL_LINK(ShellStackGuard, TimeoutHandler, Timer*, pTimer) { #ifdef DEBUG @@ -159,10 +142,6 @@ IMPL_LINK(ShellStackGuard, TimeoutHandler, Timer*, pTimer) return 0; } - - - - bool ShellStackGuard::IsPrinting (void) const { if (mpBase != NULL) @@ -178,7 +157,6 @@ bool ShellStackGuard::IsPrinting (void) const return false; } - } } // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/module/ShellStackGuard.hxx b/sd/source/ui/framework/module/ShellStackGuard.hxx index 9d97ff3d239a..44ea6a3dc62e 100644 --- a/sd/source/ui/framework/module/ShellStackGuard.hxx +++ b/sd/source/ui/framework/module/ShellStackGuard.hxx @@ -32,7 +32,6 @@ #include <cppuhelper/compbase1.hxx> #include <boost/scoped_ptr.hpp> - namespace { typedef ::cppu::WeakComponentImplHelper1 < @@ -47,9 +46,6 @@ class ViewShellBase; } - - - namespace sd { namespace framework { /** This module locks updates of the current configuration in situations @@ -72,7 +68,6 @@ public: virtual void SAL_CALL disposing (void) SAL_OVERRIDE; - // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( diff --git a/sd/source/ui/framework/module/SlideSorterModule.cxx b/sd/source/ui/framework/module/SlideSorterModule.cxx index 788edef411ee..b4a3c430b995 100644 --- a/sd/source/ui/framework/module/SlideSorterModule.cxx +++ b/sd/source/ui/framework/module/SlideSorterModule.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "SlideSorterModule.hxx" #include "framework/FrameworkHelper.hxx" @@ -34,10 +33,8 @@ using namespace ::com::sun::star::drawing::framework; using ::sd::framework::FrameworkHelper; - namespace sd { namespace framework { - //===== SlideSorterModule ================================================== SlideSorterModule::SlideSorterModule ( @@ -74,9 +71,6 @@ SlideSorterModule::SlideSorterModule ( } } - - - SlideSorterModule::~SlideSorterModule (void) { } @@ -91,7 +85,6 @@ void SlideSorterModule::SaveResourceState (void) SvtSlideSorterBarOptions().SetVisibleDrawView(IsResourceActive(FrameworkHelper::msDrawViewURL)); } - void SAL_CALL SlideSorterModule::notifyConfigurationChange ( const ConfigurationChangeEvent& rEvent) throw (RuntimeException, std::exception) @@ -153,8 +146,6 @@ void SlideSorterModule::UpdateViewTabBar (const Reference<XTabBar>& rxTabBar) } } - - } } // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/module/ToolBarModule.cxx b/sd/source/ui/framework/module/ToolBarModule.cxx index 47f4ecaf1b55..a7b88bd06a13 100644 --- a/sd/source/ui/framework/module/ToolBarModule.cxx +++ b/sd/source/ui/framework/module/ToolBarModule.cxx @@ -17,14 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ToolBarModule.hxx" #include "ViewShellBase.hxx" #include "DrawController.hxx" #include "framework/FrameworkHelper.hxx" #include "framework/ConfigurationController.hxx" - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; @@ -86,16 +84,10 @@ ToolBarModule::ToolBarModule ( } } - - - ToolBarModule::~ToolBarModule (void) { } - - - void SAL_CALL ToolBarModule::disposing (void) { if (mxConfigurationController.is()) @@ -104,9 +96,6 @@ void SAL_CALL ToolBarModule::disposing (void) mxConfigurationController = NULL; } - - - void SAL_CALL ToolBarModule::notifyConfigurationChange ( const ConfigurationChangeEvent& rEvent) throw (RuntimeException, std::exception) @@ -144,12 +133,6 @@ void SAL_CALL ToolBarModule::notifyConfigurationChange ( } } - - - - - - void ToolBarModule::HandleUpdateStart (void) { // Lock the ToolBarManager and tell it to lock the ViewShellManager as @@ -164,9 +147,6 @@ void ToolBarModule::HandleUpdateStart (void) } } - - - void ToolBarModule::HandleUpdateEnd (void) { if (mbMainViewSwitchUpdatePending) @@ -203,9 +183,6 @@ void ToolBarModule::HandleUpdateEnd (void) mpToolBarManagerLock.reset(); } - - - void SAL_CALL ToolBarModule::disposing (const lang::EventObject& rEvent) throw (RuntimeException, std::exception) { @@ -218,9 +195,6 @@ void SAL_CALL ToolBarModule::disposing (const lang::EventObject& rEvent) } } - - - } } // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/module/ToolBarModule.hxx b/sd/source/ui/framework/module/ToolBarModule.hxx index a47c7337e5ee..1a309ac66630 100644 --- a/sd/source/ui/framework/module/ToolBarModule.hxx +++ b/sd/source/ui/framework/module/ToolBarModule.hxx @@ -34,8 +34,6 @@ namespace sd { class ViewShellBase; } - - namespace sd { namespace framework { namespace { @@ -44,7 +42,6 @@ namespace { > ToolBarModuleInterfaceBase; } - /** This module is responsible for locking the ToolBarManager during configuration updates and for triggering ToolBarManager updates. */ @@ -63,7 +60,6 @@ public: virtual void SAL_CALL disposing (void) SAL_OVERRIDE; - // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( diff --git a/sd/source/ui/framework/module/ToolPanelModule.cxx b/sd/source/ui/framework/module/ToolPanelModule.cxx index dc4d13a24cd1..942e83c5a5aa 100644 --- a/sd/source/ui/framework/module/ToolPanelModule.cxx +++ b/sd/source/ui/framework/module/ToolPanelModule.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ToolPanelModule.hxx" #include "framework/FrameworkHelper.hxx" @@ -34,10 +33,8 @@ using namespace ::com::sun::star::drawing::framework; using ::sd::framework::FrameworkHelper; - namespace sd { namespace framework { - //===== ToolPanelModule ================================================== ToolPanelModule::ToolPanelModule ( diff --git a/sd/source/ui/framework/module/ViewTabBarModule.cxx b/sd/source/ui/framework/module/ViewTabBarModule.cxx index 437584dc38dd..bc02e08151f0 100644 --- a/sd/source/ui/framework/module/ViewTabBarModule.cxx +++ b/sd/source/ui/framework/module/ViewTabBarModule.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ViewTabBarModule.hxx" #include "framework/FrameworkHelper.hxx" @@ -28,7 +27,6 @@ #include "strings.hrc" #include "sdresid.hxx" - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; @@ -79,16 +77,10 @@ ViewTabBarModule::ViewTabBarModule ( } } - - - ViewTabBarModule::~ViewTabBarModule (void) { } - - - void SAL_CALL ViewTabBarModule::disposing (void) { if (mxConfigurationController.is()) @@ -97,9 +89,6 @@ void SAL_CALL ViewTabBarModule::disposing (void) mxConfigurationController = NULL; } - - - void SAL_CALL ViewTabBarModule::notifyConfigurationChange ( const ConfigurationChangeEvent& rEvent) throw (RuntimeException, std::exception) @@ -135,9 +124,6 @@ void SAL_CALL ViewTabBarModule::notifyConfigurationChange ( } } - - - void SAL_CALL ViewTabBarModule::disposing ( const lang::EventObject& rEvent) throw (RuntimeException, std::exception) @@ -151,9 +137,6 @@ void SAL_CALL ViewTabBarModule::disposing ( } } - - - void ViewTabBarModule::UpdateViewTabBar (const Reference<XTabBar>& rxTabBar) { if (mxConfigurationController.is()) @@ -204,9 +187,6 @@ void ViewTabBarModule::UpdateViewTabBar (const Reference<XTabBar>& rxTabBar) } } - - - } } // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/module/ViewTabBarModule.hxx b/sd/source/ui/framework/module/ViewTabBarModule.hxx index dc82ab6247fd..b07eef9b0d5e 100644 --- a/sd/source/ui/framework/module/ViewTabBarModule.hxx +++ b/sd/source/ui/framework/module/ViewTabBarModule.hxx @@ -37,9 +37,6 @@ typedef ::cppu::WeakComponentImplHelper1 < } // end of anonymous namespace. - - - namespace sd { namespace framework { /** This module is responsible for showing the ViewTabBar above the view in @@ -66,7 +63,6 @@ public: virtual void SAL_CALL disposing (void) SAL_OVERRIDE; - // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index a9b1e8cc2dd5..1340814d0ae9 100644 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -49,10 +49,8 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; - namespace { - //----- CallbackCaller -------------------------------------------------------- typedef ::cppu::WeakComponentImplHelper1 < @@ -110,9 +108,6 @@ private: ::sd::framework::FrameworkHelper::Callback maCallback; }; - - - //----- LifetimeController ---------------------------------------------------- typedef ::cppu::WeakComponentImplHelper1 < @@ -157,8 +152,6 @@ private: void Update (void); }; - - } // end of anonymous namespace namespace sd { namespace framework { @@ -171,7 +164,6 @@ namespace { bool operator() (const cssdf::ConfigurationChangeEvent&) { return true; } }; - class FrameworkHelperResourceIdFilter { public: @@ -195,7 +187,6 @@ const OUString FrameworkHelper::msLeftImpressPaneURL( msPaneURLPrefix + "LeftImp const OUString FrameworkHelper::msLeftDrawPaneURL( msPaneURLPrefix + "LeftDrawPane"); const OUString FrameworkHelper::msSidebarPaneURL( msPaneURLPrefix + "SidebarPane"); - // View URLs. const OUString FrameworkHelper::msViewURLPrefix("private:resource/view/"); @@ -208,13 +199,11 @@ const OUString FrameworkHelper::msSlideSorterURL( msViewURLPrefix + "SlideSorter const OUString FrameworkHelper::msPresentationViewURL( msViewURLPrefix + "PresentationView"); const OUString FrameworkHelper::msSidebarViewURL( msViewURLPrefix + "SidebarView"); - // Tool bar URLs. const OUString FrameworkHelper::msToolBarURLPrefix("private:resource/toolbar/"); const OUString FrameworkHelper::msViewTabBarURL( msToolBarURLPrefix + "ViewTabBar"); - // Task panel URLs. const OUString FrameworkHelper::msTaskPanelURLPrefix( "private:resource/toolpanel/" ); const OUString FrameworkHelper::msAllMasterPagesTaskPanelURL( msTaskPanelURLPrefix + "AllMasterPages" ); @@ -225,7 +214,6 @@ const OUString FrameworkHelper::msTableDesignPanelURL( msTaskPanelURLPrefix + "T const OUString FrameworkHelper::msCustomAnimationTaskPanelURL( msTaskPanelURLPrefix + "CustomAnimations" ); const OUString FrameworkHelper::msSlideTransitionTaskPanelURL( msTaskPanelURLPrefix + "SlideTransitions" ); - // Event URLs. const OUString FrameworkHelper::msResourceActivationRequestEvent( "ResourceActivationRequested" ); const OUString FrameworkHelper::msResourceDeactivationRequestEvent( "ResourceDeactivationRequest" ); @@ -235,7 +223,6 @@ const OUString FrameworkHelper::msResourceDeactivationEndEvent( "ResourceDeactiv const OUString FrameworkHelper::msConfigurationUpdateStartEvent( "ConfigurationUpdateStart" ); const OUString FrameworkHelper::msConfigurationUpdateEndEvent( "ConfigurationUpdateEnd" ); - // Service names of controllers. const OUString FrameworkHelper::msModuleControllerService("com.sun.star.drawing.framework.ModuleController"); const OUString FrameworkHelper::msConfigurationControllerService("com.sun.star.drawing.framework.ConfigurationController"); @@ -280,7 +267,6 @@ namespace } } - //----- FrameworkHelper::ViewURLMap ------------------------------------------- /** The ViewURLMap is used to translate between the view URLs used by the @@ -296,9 +282,6 @@ public: ViewURLMap (void) {} }; - - - //----- Framework::DiposeListener --------------------------------------------- namespace { @@ -324,9 +307,6 @@ private: ::boost::shared_ptr<FrameworkHelper> mpHelper; }; - - - //----- FrameworkHelper::Deleter ---------------------------------------------- class FrameworkHelper::Deleter @@ -338,18 +318,12 @@ public: } }; - - - //----- FrameworkHelper ------------------------------------------------------- ::boost::scoped_ptr<FrameworkHelper::ViewURLMap> FrameworkHelper::mpViewURLMap(new ViewURLMap()); - FrameworkHelper::InstanceMap FrameworkHelper::maInstanceMap; - - ::boost::shared_ptr<FrameworkHelper> FrameworkHelper::Instance ( const Reference<frame::XController>& rxController) { @@ -370,9 +344,6 @@ FrameworkHelper::InstanceMap FrameworkHelper::maInstanceMap; return ::boost::shared_ptr<FrameworkHelper>(); } - - - ::boost::shared_ptr<FrameworkHelper> FrameworkHelper::Instance (ViewShellBase& rBase) { @@ -402,9 +373,6 @@ FrameworkHelper::InstanceMap FrameworkHelper::maInstanceMap; return pHelper; } - - - void FrameworkHelper::DisposeInstance (ViewShellBase& rBase) { InstanceMap::iterator iHelper (maInstanceMap.find(&rBase)); @@ -414,9 +382,6 @@ void FrameworkHelper::DisposeInstance (ViewShellBase& rBase) } } - - - void FrameworkHelper::ReleaseInstance (ViewShellBase& rBase) { InstanceMap::iterator iHelper (maInstanceMap.find(&rBase)); @@ -424,9 +389,6 @@ void FrameworkHelper::ReleaseInstance (ViewShellBase& rBase) maInstanceMap.erase(iHelper); } - - - FrameworkHelper::FrameworkHelper (ViewShellBase& rBase) : mrBase(rBase), mxConfigurationController(), @@ -442,24 +404,15 @@ FrameworkHelper::FrameworkHelper (ViewShellBase& rBase) new LifetimeController(mrBase); } - - - void FrameworkHelper::Initialize (void) { mxDisposeListener = new DisposeListener(shared_from_this()); } - - - FrameworkHelper::~FrameworkHelper (void) { } - - - void FrameworkHelper::Dispose (void) { if (mxDisposeListener.is()) @@ -467,17 +420,11 @@ void FrameworkHelper::Dispose (void) mxConfigurationController = NULL; } - - - bool FrameworkHelper::IsValid (void) { return mxConfigurationController.is(); } - - - ::boost::shared_ptr<ViewShell> FrameworkHelper::GetViewShell (const OUString& rsPaneURL) { if ( !mxConfigurationController.is() ) @@ -487,17 +434,11 @@ bool FrameworkHelper::IsValid (void) return lcl_getViewShell( lcl_getFirstViewInPane( mxConfigurationController, xPaneId ) ); } - - - ::boost::shared_ptr<ViewShell> FrameworkHelper::GetViewShell (const Reference<XView>& rxView) { return lcl_getViewShell( rxView.get() ); } - - - Reference<XView> FrameworkHelper::GetView (const Reference<XResourceId>& rxPaneOrViewId) { Reference<XView> xView; @@ -527,9 +468,6 @@ Reference<XView> FrameworkHelper::GetView (const Reference<XResourceId>& rxPaneO return xView; } - - - Reference<XResourceId> FrameworkHelper::RequestView ( const OUString& rsResourceURL, const OUString& rsAnchorURL) @@ -562,9 +500,6 @@ Reference<XResourceId> FrameworkHelper::RequestView ( return xViewId; } - - - ViewShell::ShellType FrameworkHelper::GetViewId (const OUString& rsViewURL) { if (mpViewURLMap->empty()) @@ -585,9 +520,6 @@ ViewShell::ShellType FrameworkHelper::GetViewId (const OUString& rsViewURL) return ViewShell::ST_NONE; } - - - OUString FrameworkHelper::GetViewURL (ViewShell::ShellType eType) { switch (eType) @@ -605,9 +537,6 @@ OUString FrameworkHelper::GetViewURL (ViewShell::ShellType eType) } } - - - void FrameworkHelper::HandleModeChangeSlot ( sal_uLong nSlotId, SfxRequest& rRequest) @@ -644,7 +573,6 @@ void FrameworkHelper::HandleModeChangeSlot ( if ( ! mxConfigurationController.is()) throw RuntimeException(); - Reference<XResourceId> xPaneId ( CreateResourceId(framework::FrameworkHelper::msCenterPaneURL)); Reference<XView> xView (GetView(xPaneId)); @@ -711,9 +639,6 @@ void FrameworkHelper::HandleModeChangeSlot ( } } - - - void FrameworkHelper::RunOnConfigurationEvent( const OUString& rsEventType, const Callback& rCallback) @@ -724,9 +649,6 @@ void FrameworkHelper::RunOnConfigurationEvent( rCallback); } - - - void FrameworkHelper::RunOnResourceActivation( const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId, const Callback& rCallback) @@ -757,9 +679,6 @@ private: bool& mrFlag; }; - - - void FrameworkHelper::RequestSynchronousUpdate (void) { rtl::Reference<ConfigurationController> pCC ( @@ -768,9 +687,6 @@ void FrameworkHelper::RequestSynchronousUpdate (void) pCC->RequestSynchronousUpdate(); } - - - void FrameworkHelper::WaitForEvent (const OUString& rsEventType) const { bool bConfigurationUpdateSeen (false); @@ -793,17 +709,11 @@ void FrameworkHelper::WaitForEvent (const OUString& rsEventType) const } } - - - void FrameworkHelper::WaitForUpdate (void) const { WaitForEvent(msConfigurationUpdateEndEvent); } - - - void FrameworkHelper::RunOnEvent( const OUString& rsEventType, const ConfigurationChangeEventFilter& rFilter, @@ -812,18 +722,12 @@ void FrameworkHelper::RunOnEvent( new CallbackCaller(mrBase,rsEventType,rFilter,rCallback); } - - - void FrameworkHelper::disposing (const lang::EventObject& rEventObject) { if (rEventObject.Source == mxConfigurationController) mxConfigurationController = NULL; } - - - void FrameworkHelper::UpdateConfiguration (void) { if (mxConfigurationController.is()) @@ -844,9 +748,6 @@ void FrameworkHelper::UpdateConfiguration (void) } } - - - OUString FrameworkHelper::ResourceIdToString (const Reference<XResourceId>& rxResourceId) { OUString sString; @@ -866,17 +767,11 @@ OUString FrameworkHelper::ResourceIdToString (const Reference<XResourceId>& rxRe return sString; } - - - Reference<XResourceId> FrameworkHelper::CreateResourceId (const OUString& rsResourceURL) { return new ::sd::framework::ResourceId(rsResourceURL); } - - - Reference<XResourceId> FrameworkHelper::CreateResourceId ( const OUString& rsResourceURL, const OUString& rsAnchorURL) @@ -884,9 +779,6 @@ Reference<XResourceId> FrameworkHelper::CreateResourceId ( return new ::sd::framework::ResourceId(rsResourceURL, rsAnchorURL); } - - - Reference<XResourceId> FrameworkHelper::CreateResourceId ( const OUString& rsResourceURL, const Reference<XResourceId>& rxAnchorId) @@ -900,13 +792,6 @@ Reference<XResourceId> FrameworkHelper::CreateResourceId ( return new ::sd::framework::ResourceId(rsResourceURL); } - - - - - - - //----- FrameworkHelper::DisposeListener -------------------------------------- FrameworkHelper::DisposeListener::DisposeListener ( @@ -919,16 +804,10 @@ FrameworkHelper::DisposeListener::DisposeListener ( xComponent->addEventListener(this); } - - - FrameworkHelper::DisposeListener::~DisposeListener (void) { } - - - void SAL_CALL FrameworkHelper::DisposeListener::disposing (void) { Reference<XComponent> xComponent (mpHelper->mxConfigurationController, UNO_QUERY); @@ -938,9 +817,6 @@ void SAL_CALL FrameworkHelper::DisposeListener::disposing (void) mpHelper.reset(); } - - - void SAL_CALL FrameworkHelper::DisposeListener::disposing (const lang::EventObject& rEventObject) throw(RuntimeException, std::exception) { @@ -948,9 +824,6 @@ void SAL_CALL FrameworkHelper::DisposeListener::disposing (const lang::EventObje mpHelper->disposing(rEventObject); } - - - //===== FrameworkHelperResourceIdFilter ======================================= FrameworkHelperResourceIdFilter::FrameworkHelperResourceIdFilter ( @@ -959,7 +832,6 @@ FrameworkHelperResourceIdFilter::FrameworkHelperResourceIdFilter ( { } - } } // end of namespace sd::framework namespace { @@ -1004,16 +876,10 @@ CallbackCaller::CallbackCaller ( } } - - - CallbackCaller::~CallbackCaller (void) { } - - - void CallbackCaller::disposing (void) { try @@ -1031,9 +897,6 @@ void CallbackCaller::disposing (void) } } - - - void SAL_CALL CallbackCaller::disposing (const lang::EventObject& rEvent) throw (RuntimeException, std::exception) { @@ -1044,9 +907,6 @@ void SAL_CALL CallbackCaller::disposing (const lang::EventObject& rEvent) } } - - - void SAL_CALL CallbackCaller::notifyConfigurationChange ( const ConfigurationChangeEvent& rEvent) throw (RuntimeException, std::exception) @@ -1068,9 +928,6 @@ void SAL_CALL CallbackCaller::notifyConfigurationChange ( } } - - - //----- LifetimeController ------------------------------------------------- LifetimeController::LifetimeController (::sd::ViewShellBase& rBase) @@ -1096,24 +953,15 @@ LifetimeController::LifetimeController (::sd::ViewShellBase& rBase) } } - - - LifetimeController::~LifetimeController (void) { OSL_ASSERT(!mbListeningToController && !mbListeningToViewShellBase); } - - - void LifetimeController::disposing (void) { } - - - void SAL_CALL LifetimeController::disposing (const lang::EventObject& rEvent) throw(RuntimeException, std::exception) { @@ -1122,9 +970,6 @@ void SAL_CALL LifetimeController::disposing (const lang::EventObject& rEvent) Update(); } - - - void LifetimeController::Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint) { (void)rBroadcaster; @@ -1137,9 +982,6 @@ void LifetimeController::Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rH } } - - - void LifetimeController::Update (void) { if (mbListeningToViewShellBase && mbListeningToController) @@ -1163,8 +1005,6 @@ void LifetimeController::Update (void) } } - - } // end of anonymous namespace. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/func/bulmaper.cxx b/sd/source/ui/func/bulmaper.cxx index 8ee4c4485e31..4563e1e98b7d 100644 --- a/sd/source/ui/func/bulmaper.cxx +++ b/sd/source/ui/func/bulmaper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <svx/svxids.hrc> //-> Fonts & Items @@ -42,7 +41,6 @@ #include "bulmaper.hxx" - #define GetWhich(nSlot) rSet.GetPool()->GetWhich( nSlot ) void SdBulletMapper::MapFontsInNumRule( SvxNumRule& aNumRule, const SfxItemSet& rSet ) diff --git a/sd/source/ui/func/fuarea.cxx b/sd/source/ui/func/fuarea.cxx index a6da6484bcb8..ef48a6c89bf8 100644 --- a/sd/source/ui/func/fuarea.cxx +++ b/sd/source/ui/func/fuarea.cxx @@ -39,7 +39,6 @@ namespace sd { TYPEINIT1( FuArea, FuPoor ); - FuArea::FuArea( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* _pView, SdDrawDocument* pDoc, SfxRequest& rReq) : FuPoor(pViewSh, pWin, _pView, pDoc, rReq) { diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx index 54c4f87a4e45..aae59784899b 100644 --- a/sd/source/ui/func/fubullet.cxx +++ b/sd/source/ui/func/fubullet.cxx @@ -54,7 +54,6 @@ const sal_Unicode CHAR_ZWNBSP = ((sal_Unicode)0x2060); TYPEINIT1( FuBullet, FuPoor ); - FuBullet::FuBullet ( ViewShell* pViewSh, ::sd::Window* pWin, diff --git a/sd/source/ui/func/fuchar.cxx b/sd/source/ui/func/fuchar.cxx index 0c42a4f4cdd4..222634cb8164 100644 --- a/sd/source/ui/func/fuchar.cxx +++ b/sd/source/ui/func/fuchar.cxx @@ -40,7 +40,6 @@ namespace sd { TYPEINIT1( FuChar, FuPoor ); - FuChar::FuChar ( ViewShell* pViewSh, ::sd::Window* pWin, diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx index c77d680ff1af..b1cb4d390cce 100644 --- a/sd/source/ui/func/fucon3d.cxx +++ b/sd/source/ui/func/fucon3d.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "fucon3d.hxx" #include <vcl/waitobj.hxx> @@ -53,7 +52,6 @@ namespace sd { TYPEINIT1( FuConstruct3dObject, FuConstruct ); - FuConstruct3dObject::FuConstruct3dObject ( ViewShell* pViewSh, ::sd::Window* pWin, @@ -81,7 +79,6 @@ void FuConstruct3dObject::DoExecute( SfxRequest& rReq ) ToolBarManager::msDrawingObjectToolBar); } - E3dCompoundObject* FuConstruct3dObject::ImpCreateBasic3DShape() { E3dCompoundObject* p3DObj = NULL; @@ -338,13 +335,11 @@ bool FuConstruct3dObject::MouseButtonDown(const MouseEvent& rMEvt) return bReturn; } - bool FuConstruct3dObject::MouseMove(const MouseEvent& rMEvt) { return FuConstruct::MouseMove(rMEvt); } - bool FuConstruct3dObject::MouseButtonUp(const MouseEvent& rMEvt) { bool bReturn = false; @@ -372,7 +367,6 @@ bool FuConstruct3dObject::KeyInput(const KeyEvent& rKEvt) return FuConstruct::KeyInput(rKEvt); } - void FuConstruct3dObject::Activate() { mpView->SetCurrentObj(OBJ_NONE); @@ -380,7 +374,6 @@ void FuConstruct3dObject::Activate() FuConstruct::Activate(); } - void FuConstruct3dObject::Deactivate() { FuConstruct::Deactivate(); diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx index ca77fbe122d8..b044b454bc13 100644 --- a/sd/source/ui/func/fuconarc.cxx +++ b/sd/source/ui/func/fuconarc.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "fuconarc.hxx" #include <svx/svdpagv.hxx> #include <svx/svdocirc.hxx> @@ -28,7 +27,6 @@ #include <svx/svdobj.hxx> #include <sfx2/viewfrm.hxx> - #include <svx/svxids.hrc> #include <math.h> @@ -47,7 +45,6 @@ namespace sd { TYPEINIT1( FuConstructArc, FuConstruct ); - FuConstructArc::FuConstructArc ( ViewShell* pViewSh, ::sd::Window* pWin, @@ -103,7 +100,6 @@ void FuConstructArc::DoExecute( SfxRequest& rReq ) } } - bool FuConstructArc::MouseButtonDown( const MouseEvent& rMEvt ) { bool bReturn = FuConstruct::MouseButtonDown( rMEvt ); @@ -130,13 +126,11 @@ bool FuConstructArc::MouseButtonDown( const MouseEvent& rMEvt ) return bReturn; } - bool FuConstructArc::MouseMove( const MouseEvent& rMEvt ) { return FuConstruct::MouseMove(rMEvt); } - bool FuConstructArc::MouseButtonUp( const MouseEvent& rMEvt ) { bool bReturn = false; @@ -174,7 +168,6 @@ bool FuConstructArc::KeyInput(const KeyEvent& rKEvt) return FuConstruct::KeyInput(rKEvt); } - void FuConstructArc::Activate() { SdrObjKind aObjKind; @@ -218,7 +211,6 @@ void FuConstructArc::Activate() FuConstruct::Activate(); } - void FuConstructArc::Deactivate() { FuConstruct::Deactivate(); diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx index b61fc5d2ca4e..541b38ad5a9a 100644 --- a/sd/source/ui/func/fuconbez.cxx +++ b/sd/source/ui/func/fuconbez.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/presentation/EffectNodeType.hpp> #include "fuconbez.hxx" @@ -30,7 +29,6 @@ #include <sfx2/request.hxx> #include <sfx2/viewfrm.hxx> - #include <svx/svxids.hrc> #include <svx/svdpagv.hxx> @@ -53,8 +51,6 @@ namespace sd { TYPEINIT1( FuConstructBezierPolygon, FuConstruct ); - - FuConstructBezierPolygon::FuConstructBezierPolygon ( ViewShell* pViewSh, ::sd::Window* pWin, @@ -88,7 +84,6 @@ void FuConstructBezierPolygon::DoExecute( SfxRequest& rReq ) } } - bool FuConstructBezierPolygon::MouseButtonDown(const MouseEvent& rMEvt) { bool bReturn = FuConstruct::MouseButtonDown(rMEvt); @@ -138,13 +133,11 @@ bool FuConstructBezierPolygon::MouseButtonDown(const MouseEvent& rMEvt) return(bReturn); } - bool FuConstructBezierPolygon::MouseMove(const MouseEvent& rMEvt) { return FuConstruct::MouseMove(rMEvt); } - bool FuConstructBezierPolygon::MouseButtonUp(const MouseEvent& rMEvt ) { bool bReturn = false; @@ -232,7 +225,6 @@ bool FuConstructBezierPolygon::KeyInput(const KeyEvent& rKEvt) return FuConstruct::KeyInput(rKEvt); } - void FuConstructBezierPolygon::Activate() { mpView->EnableExtendedMouseEventDispatcher(true); @@ -291,7 +283,6 @@ void FuConstructBezierPolygon::Activate() FuConstruct::Activate(); } - void FuConstructBezierPolygon::Deactivate() { mpView->EnableExtendedMouseEventDispatcher(false); @@ -299,8 +290,6 @@ void FuConstructBezierPolygon::Deactivate() FuConstruct::Deactivate(); } - - void FuConstructBezierPolygon::SelectionHasChanged() { FuDraw::SelectionHasChanged(); @@ -310,7 +299,6 @@ void FuConstructBezierPolygon::SelectionHasChanged() *mpView); } - /** * Set current bezier edit mode */ diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx index cea7ea815b4d..8d1c003a52c3 100644 --- a/sd/source/ui/func/fuconcs.cxx +++ b/sd/source/ui/func/fuconcs.cxx @@ -17,11 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "fuconcs.hxx" #include <svx/svdpagv.hxx> - #include <svx/svxids.hrc> #include <svx/dialogs.hrc> #include <svx/dialmgr.hxx> @@ -73,7 +71,6 @@ namespace sd { TYPEINIT1( FuConstructCustomShape, FuConstruct ); - FuConstructCustomShape::FuConstructCustomShape ( ViewShell* pViewSh, ::sd::Window* pWin, @@ -109,7 +106,6 @@ void FuConstructCustomShape::DoExecute( SfxRequest& rReq ) ToolBarManager::msDrawingObjectToolBar); } - bool FuConstructCustomShape::MouseButtonDown(const MouseEvent& rMEvt) { bool bReturn = FuConstruct::MouseButtonDown(rMEvt); @@ -143,13 +139,11 @@ bool FuConstructCustomShape::MouseButtonDown(const MouseEvent& rMEvt) return bReturn; } - bool FuConstructCustomShape::MouseMove(const MouseEvent& rMEvt) { return FuConstruct::MouseMove(rMEvt); } - bool FuConstructCustomShape::MouseButtonUp(const MouseEvent& rMEvt) { bool bReturn(false); @@ -179,7 +173,6 @@ bool FuConstructCustomShape::KeyInput(const KeyEvent& rKEvt) return FuConstruct::KeyInput(rKEvt); } - void FuConstructCustomShape::Activate() { mpView->SetCurrentObj( OBJ_CUSTOMSHAPE ); @@ -239,7 +232,6 @@ void FuConstructCustomShape::SetAttributes( SdrObject* pObj ) } bAttributesAppliedFromGallery = true; - /* com::sun::star::uno::Any aAny; if ( ((SdrCustomShapeGeometryItem&)pObj->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )).QueryValue( aAny ) ) diff --git a/sd/source/ui/func/fuconnct.cxx b/sd/source/ui/func/fuconnct.cxx index 37837e045408..7a640ccd1ab3 100644 --- a/sd/source/ui/func/fuconnct.cxx +++ b/sd/source/ui/func/fuconnct.cxx @@ -31,7 +31,6 @@ namespace sd { TYPEINIT1( FuConnectionDlg, FuPoor ); - FuConnectionDlg::FuConnectionDlg ( ViewShell* pViewSh, ::sd::Window* pWin, diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx index 20b6a09973c8..6b8775862e55 100644 --- a/sd/source/ui/func/fuconrec.cxx +++ b/sd/source/ui/func/fuconrec.cxx @@ -17,11 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "fuconrec.hxx" #include <svx/svdpagv.hxx> - #include <svx/svxids.hrc> #include <svx/dialogs.hrc> #include <svx/dialmgr.hxx> @@ -68,7 +66,6 @@ namespace sd { TYPEINIT1( FuConstructRectangle, FuConstruct ); - FuConstructRectangle::FuConstructRectangle ( ViewShell* pViewSh, ::sd::Window* pWin, @@ -180,7 +177,6 @@ void FuConstructRectangle::DoExecute( SfxRequest& rReq ) } } - bool FuConstructRectangle::MouseButtonDown(const MouseEvent& rMEvt) { bool bReturn = FuConstruct::MouseButtonDown(rMEvt); @@ -220,13 +216,11 @@ bool FuConstructRectangle::MouseButtonDown(const MouseEvent& rMEvt) return bReturn; } - bool FuConstructRectangle::MouseMove(const MouseEvent& rMEvt) { return FuConstruct::MouseMove(rMEvt); } - bool FuConstructRectangle::MouseButtonUp(const MouseEvent& rMEvt) { bool bReturn(false); @@ -282,7 +276,6 @@ bool FuConstructRectangle::KeyInput(const KeyEvent& rKEvt) return FuConstruct::KeyInput(rKEvt); } - void FuConstructRectangle::Activate() { SdrObjKind aObjKind; @@ -384,7 +377,6 @@ void FuConstructRectangle::Activate() FuConstruct::Activate(); } - void FuConstructRectangle::Deactivate() { if( nSlotId == SID_TOOL_CONNECTOR || @@ -428,7 +420,6 @@ void FuConstructRectangle::Deactivate() FuConstruct::Deactivate(); } - /** * set attribute for the object to be created */ @@ -520,7 +511,6 @@ void FuConstructRectangle::SetAttributes(SfxItemSet& rAttr, SdrObject* pObj) } } - /** * set line starts and ends for the object to be created */ diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx index fe39c1d81e1c..b77aad877b74 100644 --- a/sd/source/ui/func/fuconstr.cxx +++ b/sd/source/ui/func/fuconstr.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "fuconstr.hxx" #include <svx/svxids.hrc> @@ -45,7 +44,6 @@ namespace sd { TYPEINIT1( FuConstruct, FuDraw ); - FuConstruct::FuConstruct ( ViewShell* pViewSh, ::sd::Window* pWin, @@ -62,7 +60,6 @@ void FuConstruct::DoExecute( SfxRequest& rReq ) FuDraw::DoExecute( rReq ); } - bool FuConstruct::MouseButtonDown(const MouseEvent& rMEvt) { bool bReturn = FuDraw::MouseButtonDown(rMEvt); @@ -103,7 +100,6 @@ bool FuConstruct::MouseButtonDown(const MouseEvent& rMEvt) return bReturn; } - bool FuConstruct::MouseMove(const MouseEvent& rMEvt) { FuDraw::MouseMove(rMEvt); @@ -128,7 +124,6 @@ bool FuConstruct::MouseMove(const MouseEvent& rMEvt) return true; } - bool FuConstruct::MouseButtonUp(const MouseEvent& rMEvt) { bool bReturn = true; @@ -236,14 +231,12 @@ bool FuConstruct::KeyInput(const KeyEvent& rKEvt) return(bReturn); } - void FuConstruct::Activate() { mpView->SetEditMode(SDREDITMODE_CREATE); FuDraw::Activate(); } - void FuConstruct::Deactivate() { FuDraw::Deactivate(); diff --git a/sd/source/ui/func/fuconuno.cxx b/sd/source/ui/func/fuconuno.cxx index 13892f1aad16..65a09c5824f9 100644 --- a/sd/source/ui/func/fuconuno.cxx +++ b/sd/source/ui/func/fuconuno.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "fuconuno.hxx" #include <svl/aeitem.hxx> #include <sfx2/dispatch.hxx> @@ -25,7 +24,6 @@ #include <sfx2/request.hxx> #include <svl/intitem.hxx> - #include <svx/fmglob.hxx> #include <svx/dialogs.hrc> @@ -45,7 +43,6 @@ namespace sd { TYPEINIT1( FuConstructUnoControl, FuConstruct ); - FuConstructUnoControl::FuConstructUnoControl ( ViewShell* pViewSh, ::sd::Window* pWin, diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx index 9cbcc06c4fa0..800ce2f78be8 100644 --- a/sd/source/ui/func/fucopy.cxx +++ b/sd/source/ui/func/fucopy.cxx @@ -44,7 +44,6 @@ namespace sd { TYPEINIT1( FuCopy, FuPoor ); - FuCopy::FuCopy ( ViewShell* pViewSh, ::sd::Window* pWin, diff --git a/sd/source/ui/func/fucushow.cxx b/sd/source/ui/func/fucushow.cxx index 514520beaf76..e9e3e5a9bf32 100644 --- a/sd/source/ui/func/fucushow.cxx +++ b/sd/source/ui/func/fucushow.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "fucushow.hxx" #include <svx/svxids.hrc> @@ -38,8 +37,6 @@ namespace sd { TYPEINIT1( FuCustomShowDlg, FuPoor ); - - FuCustomShowDlg::FuCustomShowDlg ( ViewShell* pViewSh, ::sd::Window* pWin, diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index f06425d24c5a..f12799583fc4 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <sot/object.hxx> #include <editeng/eeitem.hxx> #include <vcl/waitobj.hxx> @@ -212,7 +211,6 @@ bool FuDraw::MouseButtonDown(const MouseEvent& rMEvt) return bReturn; } - bool FuDraw::MouseMove(const MouseEvent& rMEvt) { FrameView* pFrameView = mpViewShell->GetFrameView(); @@ -322,7 +320,6 @@ bool FuDraw::MouseMove(const MouseEvent& rMEvt) return bReturn; } - bool FuDraw::MouseButtonUp(const MouseEvent& rMEvt) { if (mpView && mpView->IsDragHelpLine()) @@ -498,20 +495,17 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt) return (bReturn); } - void FuDraw::Activate() { FuPoor::Activate(); ForcePointer(); } - void FuDraw::Deactivate() { FuPoor::Deactivate(); } - /** * Toggle mouse-pointer */ @@ -726,8 +720,6 @@ bool FuDraw::SetPointer(SdrObject* pObj, const Point& rPos) return bSet; } - - /** * Response of doubleclick */ @@ -787,7 +779,6 @@ void FuDraw::DoubleClick(const MouseEvent& rMEvt) mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); } - bool FuDraw::RequestHelp(const HelpEvent& rHEvt) { bool bReturn = false; @@ -829,8 +820,6 @@ bool FuDraw::RequestHelp(const HelpEvent& rHEvt) return(bReturn); } - - bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewEvent& rVEvt) { bool bSet = false; @@ -985,7 +974,6 @@ bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewE return bSet; } - /** is called when the current function should be aborted. <p> This is used when a function gets a KEY_ESCAPE but can also be called directly. diff --git a/sd/source/ui/func/fudspord.cxx b/sd/source/ui/func/fudspord.cxx index a22b46922b24..c8b70fec4226 100644 --- a/sd/source/ui/func/fudspord.cxx +++ b/sd/source/ui/func/fudspord.cxx @@ -33,7 +33,6 @@ namespace sd { TYPEINIT1( FuDisplayOrder, FuPoor ); - FuDisplayOrder::FuDisplayOrder( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq) : FuPoor(pViewSh, pWin, pView, pDoc, rReq) , mpRefObj(NULL) @@ -41,7 +40,6 @@ FuDisplayOrder::FuDisplayOrder( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::Vi { } - FuDisplayOrder::~FuDisplayOrder() { implClearOverlay(); @@ -62,7 +60,6 @@ rtl::Reference<FuPoor> FuDisplayOrder::Create( ViewShell* pViewSh, ::sd::Window* return xFunc; } - bool FuDisplayOrder::MouseButtonDown(const MouseEvent& rMEvt) { // remember button state for creation of own MouseEvents @@ -71,7 +68,6 @@ bool FuDisplayOrder::MouseButtonDown(const MouseEvent& rMEvt) return true; } - bool FuDisplayOrder::MouseMove(const MouseEvent& rMEvt) { SdrObject* pPickObj; @@ -101,7 +97,6 @@ bool FuDisplayOrder::MouseMove(const MouseEvent& rMEvt) return true; } - bool FuDisplayOrder::MouseButtonUp(const MouseEvent& rMEvt) { // remember button state for creation of own MouseEvents @@ -127,20 +122,17 @@ bool FuDisplayOrder::MouseButtonUp(const MouseEvent& rMEvt) return true; } - void FuDisplayOrder::Activate() { maPtr = mpWindow->GetPointer(); mpWindow->SetPointer( Pointer( POINTER_REFHAND ) ); } - void FuDisplayOrder::Deactivate() { mpWindow->SetPointer( maPtr ); } - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/func/fuediglu.cxx b/sd/source/ui/func/fuediglu.cxx index 7907884476d3..889a2bf19df5 100644 --- a/sd/source/ui/func/fuediglu.cxx +++ b/sd/source/ui/func/fuediglu.cxx @@ -17,14 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "fuediglu.hxx" #include <svl/eitem.hxx> #include <svx/dialogs.hrc> #include <svx/svdglue.hxx> #include <sfx2/request.hxx> - #include "app.hrc" #include "strings.hrc" #include "res_bmp.hrc" @@ -40,7 +38,6 @@ namespace sd { TYPEINIT1( FuEditGluePoints, FuDraw ); - FuEditGluePoints::FuEditGluePoints ( ViewShell* pViewSh, ::sd::Window* pWin, @@ -73,7 +70,6 @@ void FuEditGluePoints::DoExecute( SfxRequest& rReq ) ToolBarManager::msGluePointsToolBar); } - FuEditGluePoints::~FuEditGluePoints() { mpView->BrkAction(); @@ -81,7 +77,6 @@ FuEditGluePoints::~FuEditGluePoints() mpView->SetInsGluePointMode(false); } - bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt) { mpView->SetActualWin( mpWindow ); @@ -204,7 +199,6 @@ bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt) return bReturn; } - bool FuEditGluePoints::MouseMove(const MouseEvent& rMEvt) { mpView->SetActualWin( mpWindow ); @@ -224,7 +218,6 @@ bool FuEditGluePoints::MouseMove(const MouseEvent& rMEvt) return true; } - bool FuEditGluePoints::MouseButtonUp(const MouseEvent& rMEvt) { mpView->SetActualWin( mpWindow ); @@ -374,21 +367,18 @@ bool FuEditGluePoints::Command(const CommandEvent& rCEvt) return FuPoor::Command( rCEvt ); } - void FuEditGluePoints::Activate() { mpView->SetGluePointEditMode(); FuDraw::Activate(); } - void FuEditGluePoints::Deactivate() { mpView->SetGluePointEditMode( false ); FuDraw::Deactivate(); } - void FuEditGluePoints::ReceiveRequest(SfxRequest& rReq) { switch (rReq.GetSlot()) @@ -477,7 +467,6 @@ void FuEditGluePoints::ReceiveRequest(SfxRequest& rReq) FuPoor::ReceiveRequest(rReq); } - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx index 5626cb4533ed..1c058089d46f 100644 --- a/sd/source/ui/func/fuexpand.cxx +++ b/sd/source/ui/func/fuexpand.cxx @@ -47,7 +47,6 @@ namespace sd { TYPEINIT1( FuExpandPage, FuPoor ); - FuExpandPage::FuExpandPage ( ViewShell* pViewSh, ::sd::Window* pWin, diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx index cc8967fe33b5..137923f6bbb0 100644 --- a/sd/source/ui/func/fuformatpaintbrush.cxx +++ b/sd/source/ui/func/fuformatpaintbrush.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <sfx2/request.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> @@ -284,7 +283,6 @@ void FuFormatPaintBrush::Paste( bool bNoCharacterFormats, bool bNoParagraphForma rSet.DisableItem( SID_FORMATPAINTBRUSH ); } - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx index 33619e434e09..604e04cff453 100644 --- a/sd/source/ui/func/fuhhconv.cxx +++ b/sd/source/ui/func/fuhhconv.cxx @@ -43,7 +43,6 @@ class SfxRequest; - using namespace ::com::sun::star; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::uno; @@ -54,7 +53,6 @@ class ViewShell; TYPEINIT1( FuHangulHanjaConversion, FuPoor ); - FuHangulHanjaConversion::FuHangulHanjaConversion ( ViewShell* pViewSh, ::sd::Window* pWin, @@ -80,8 +78,6 @@ FuHangulHanjaConversion::FuHangulHanjaConversion ( pSdOutliner->PrepareSpelling(); } - - FuHangulHanjaConversion::~FuHangulHanjaConversion() { if (pSdOutliner) @@ -152,7 +148,6 @@ void FuHangulHanjaConversion::StartConversion( sal_Int16 nSourceLanguage, sal_In mpView->EndUndo(); } - void FuHangulHanjaConversion::ConvertStyles( sal_Int16 nTargetLanguage, const Font *pTargetFont ) { if( !mpDoc ) diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index e3fbd43b7fbc..05b80fd2a3e8 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "fuinsert.hxx" #include <comphelper/storagehelper.hxx> @@ -179,7 +178,6 @@ void FuInsertGraphic::DoExecute( SfxRequest& ) } } - FuInsertClipboard::FuInsertClipboard ( ViewShell* pViewSh, ::sd::Window* pWin, @@ -248,8 +246,6 @@ void FuInsertClipboard::DoExecute( SfxRequest& ) } } - - FuInsertOLE::FuInsertOLE ( ViewShell* pViewSh, ::sd::Window* pWin, @@ -680,8 +676,6 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) } } - - FuInsertAVMedia::FuInsertAVMedia( ViewShell* pViewSh, ::sd::Window* pWin, diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx index 7074a9a5f596..99a240760e27 100644 --- a/sd/source/ui/func/fuinsfil.cxx +++ b/sd/source/ui/func/fuinsfil.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "fuinsfil.hxx" #include <vcl/wrkwin.hxx> #include <sfx2/progress.hxx> @@ -74,7 +73,6 @@ namespace sd { TYPEINIT1( FuInsertFile, FuPoor ); - FuInsertFile::FuInsertFile ( ViewShell* pViewSh, ::sd::Window* pWin, @@ -314,8 +312,6 @@ void FuInsertFile::DoExecute( SfxRequest& rReq ) } } - - bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium) { bool bOK = false; @@ -411,8 +407,6 @@ bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium) return (bOK); } - - void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium) { SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); @@ -547,8 +541,6 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium) } } - - void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium) { // selected file format: text, RTF or HTML (default is text) @@ -680,8 +672,6 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium) } } - - bool FuInsertFile::InsSDDinOlMode(SfxMedium* pMedium) { OutlineView* pOlView = static_cast<OutlineView*>(mpView); @@ -726,8 +716,6 @@ bool FuInsertFile::InsSDDinOlMode(SfxMedium* pMedium) return false; } - - void FuInsertFile::GetSupportedFilterVector( ::std::vector< OUString >& rFilterVector ) { SfxFilterMatcher& rMatcher = SFX_APP()->GetFilterMatcher(); diff --git a/sd/source/ui/func/fuline.cxx b/sd/source/ui/func/fuline.cxx index 46eafb87e0d2..f16a9d5f327f 100644 --- a/sd/source/ui/func/fuline.cxx +++ b/sd/source/ui/func/fuline.cxx @@ -42,7 +42,6 @@ namespace sd { TYPEINIT1( FuLine, FuPoor ); - FuLine::FuLine ( ViewShell* pViewSh, ::sd::Window* pWin, @@ -110,7 +109,6 @@ void FuLine::Deactivate() { } - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/func/fulinend.cxx b/sd/source/ui/func/fulinend.cxx index 8d9db840ab4a..e5073aa035f4 100644 --- a/sd/source/ui/func/fulinend.cxx +++ b/sd/source/ui/func/fulinend.cxx @@ -38,7 +38,6 @@ namespace sd { TYPEINIT1( FuLineEnd, FuPoor ); - FuLineEnd::FuLineEnd(ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq) : FuPoor(pViewSh, pWin, pView, pDoc, rReq) diff --git a/sd/source/ui/func/fulink.cxx b/sd/source/ui/func/fulink.cxx index a978cf466515..0350b2c40300 100644 --- a/sd/source/ui/func/fulink.cxx +++ b/sd/source/ui/func/fulink.cxx @@ -31,14 +31,12 @@ #include "app.hrc" #include <boost/scoped_ptr.hpp> - class SfxRequest; namespace sd { TYPEINIT1( FuLink, FuPoor ); - FuLink::FuLink ( ViewShell* pViewSh, ::sd::Window* pWin, @@ -69,7 +67,6 @@ void FuLink::DoExecute( SfxRequest& ) } } - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/func/fumeasur.cxx b/sd/source/ui/func/fumeasur.cxx index 3579b0014fe3..22bc96e496c0 100644 --- a/sd/source/ui/func/fumeasur.cxx +++ b/sd/source/ui/func/fumeasur.cxx @@ -31,7 +31,6 @@ namespace sd { TYPEINIT1( FuMeasureDlg, FuPoor ); - FuMeasureDlg::FuMeasureDlg ( ViewShell* pViewSh, ::sd::Window* pWin, @@ -72,7 +71,6 @@ void FuMeasureDlg::DoExecute( SfxRequest& rReq ) mpView->SetAttributes( *pArgs ); } - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx index c2036e25ea41..799ceb7f1a48 100644 --- a/sd/source/ui/func/fumorph.cxx +++ b/sd/source/ui/func/fumorph.cxx @@ -50,7 +50,6 @@ namespace sd { #define ITEMVALUE( ItemSet, Id, Cast ) ( ( (const Cast&) (ItemSet).Get( (Id) ) ).GetValue() ) TYPEINIT1( FuMorph, FuPoor ); - FuMorph::FuMorph ( ViewShell* pViewSh, ::sd::Window* pWin, @@ -272,7 +271,6 @@ void FuMorph::ImpEqualizePolyPointCount( rSmall = aPoly2; } - sal_uInt32 FuMorph::ImpGetNearestIndex( const ::basegfx::B2DPolygon& rPoly, const ::basegfx::B2DPoint& rPos diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx index 07e89e977044..7af1159e8c01 100644 --- a/sd/source/ui/func/fuoaprms.cxx +++ b/sd/source/ui/func/fuoaprms.cxx @@ -56,7 +56,6 @@ TYPEINIT1( FuObjectAnimationParameters, FuPoor ); #define ATTR_MIXED 1 ///< Attribute ambiguous (on multi-selection) #define ATTR_SET 2 ///< Attribute unique - FuObjectAnimationParameters::FuObjectAnimationParameters ( ViewShell* pViewSh, ::sd::Window* pWin, @@ -119,7 +118,6 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) bool bSecondSoundOn = false; bool bSecondPlayFull = false; - SdAnimationInfo* pInfo; SdrMark* pMark; @@ -628,7 +626,6 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) SdUndoGroup* pUndoGroup = new SdUndoGroup(mpDoc); pUndoGroup->SetComment(aComment); - // for the path effect, remember some stuff SdrObject* pRunningObj = NULL; SdrPathObj* pPath = NULL; @@ -660,7 +657,6 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) DBG_ASSERT(pPath, "no curve found"); - // push the running object to the end of the curve Rectangle aCurRect(pRunningObj->GetLogicRect()); Point aCurCenter(aCurRect.Center()); diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx index 9e12285687fc..19b80cf0270a 100644 --- a/sd/source/ui/func/fuolbull.cxx +++ b/sd/source/ui/func/fuolbull.cxx @@ -44,7 +44,6 @@ namespace sd { TYPEINIT1( FuOutlineBullet, FuPoor ); - FuOutlineBullet::FuOutlineBullet(ViewShell* pViewShell, ::sd::Window* pWindow, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq) diff --git a/sd/source/ui/func/fuoltext.cxx b/sd/source/ui/func/fuoltext.cxx index b9ca47444585..0e2512f3a68e 100644 --- a/sd/source/ui/func/fuoltext.cxx +++ b/sd/source/ui/func/fuoltext.cxx @@ -81,7 +81,6 @@ static sal_uInt16 SidArray[] = { TYPEINIT1( FuOutlineText, FuOutline ); - FuOutlineText::FuOutlineText(ViewShell* pViewShell, ::sd::Window* pWindow, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq) @@ -96,7 +95,6 @@ rtl::Reference<FuPoor> FuOutlineText::Create( ViewShell* pViewSh, ::sd::Window* return xFunc; } - bool FuOutlineText::MouseButtonDown(const MouseEvent& rMEvt) { mpWindow->GrabFocus(); @@ -116,7 +114,6 @@ bool FuOutlineText::MouseButtonDown(const MouseEvent& rMEvt) return (bReturn); } - bool FuOutlineText::MouseMove(const MouseEvent& rMEvt) { bool bReturn = pOutlineView->GetViewByWindow(mpWindow)->MouseMove(rMEvt); @@ -129,7 +126,6 @@ bool FuOutlineText::MouseMove(const MouseEvent& rMEvt) return (bReturn); } - bool FuOutlineText::MouseButtonUp(const MouseEvent& rMEvt) { bool bReturn = pOutlineView->GetViewByWindow(mpWindow)->MouseButtonUp(rMEvt); @@ -240,15 +236,11 @@ void FuOutlineText::UpdateForKeyPress (const KeyEvent& rEvent) pOutlineViewShell->UpdatePreview (pOutlineViewShell->GetActualPage()); } - - - void FuOutlineText::Activate() { FuOutline::Activate(); } - void FuOutlineText::Deactivate() { FuOutline::Deactivate(); @@ -292,8 +284,6 @@ void FuOutlineText::DoPasteUnformatted() } } - - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index a0bb59f82de3..3337c8e276c1 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -78,7 +78,6 @@ class Window; #define MAXHEIGHT 28350 #define MAXWIDTH 28350 - TYPEINIT1( FuPage, FuPoor ); void mergeItemSetsImpl( SfxItemSet& rTarget, const SfxItemSet& rSource ) @@ -180,7 +179,6 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) EE_PARA_WRITINGDIR, EE_PARA_WRITINGDIR, 0); - // Retrieve additional data for dialog SvxShadowItem aShadowItem(SID_ATTR_BORDER_SHADOW); @@ -192,7 +190,6 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) mpDoc->GetDefaultWritingMode() == ::com::sun::star::text::WritingMode_RL_TB ? FRMDIR_HORI_RIGHT_TOP : FRMDIR_HORI_LEFT_TOP, EE_PARA_WRITINGDIR ) ); - // Retrieve page-data for dialog SvxPageItem aPageItem( SID_ATTR_PAGE ); @@ -230,7 +227,6 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) aNewAttr.Put( SfxBoolItem( SID_ATTR_PAGE_EXT2, bFullSize ) ); - // Merge ItemSet for dialog const sal_uInt16* pPtr = aNewAttr.GetRanges(); @@ -485,7 +481,6 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs ) if( !pArgs ) return; - // Set new page-attributes PageKind ePageKind = mpDrawViewShell->GetPageKind(); const SfxPoolItem* pPoolItem; @@ -578,14 +573,11 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs ) if( bSetPageSizeAndBorder || !mbMasterPage ) mpDrawViewShell->SetPageSizeAndBorder(ePageKind, aNewSize, nLeft, nRight, nUpper, nLower, bScaleAll, eOrientation, nPaperBin, bFullSize ); - - // if bMasterPage==sal_False then create a background-object for this page with the // properties set in the dialog before, but if mbPageBckgrdDeleted==sal_True then // the background of this page was set to invisible, so it would be a mistake // to create a new background-object for this page ! - if( mbDisplayBackgroundTabPage ) { if( !mbMasterPage && !mbPageBckgrdDeleted ) diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx index 11412a25e3c3..a7cee8354098 100644 --- a/sd/source/ui/func/fupoor.cxx +++ b/sd/source/ui/func/fupoor.cxx @@ -62,7 +62,6 @@ namespace sd { TYPEINIT0( FuPoor ); - FuPoor::FuPoor ( ViewShell* pViewSh, ::sd::Window* pWin, @@ -97,7 +96,6 @@ FuPoor::FuPoor ( aDelayToScrollTimer.SetTimeout(2000); } - FuPoor::~FuPoor() { aDragTimer.Stop(); @@ -108,7 +106,6 @@ FuPoor::~FuPoor() delete pDialog; } - void FuPoor::Activate() { if (pDialog) @@ -117,7 +114,6 @@ void FuPoor::Activate() } } - void FuPoor::Deactivate() { aDragTimer.Stop(); @@ -1086,9 +1082,6 @@ void FuPoor::ImpForceQuadratic(Rectangle& rRect) } } - - - void FuPoor::SwitchLayer (sal_Int32 nOffset) { if(mpViewShell && mpViewShell->ISA(DrawViewShell)) diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx index 702a10f79718..dfd71bc2a90d 100644 --- a/sd/source/ui/func/fuprlout.cxx +++ b/sd/source/ui/func/fuprlout.cxx @@ -131,8 +131,6 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq ) aSet.Put( SfxBoolItem( ATTR_PRESLAYOUT_CHECK_MASTERS, bCheckMasters ) ); aSet.Put( SfxStringItem( ATTR_PRESLAYOUT_NAME, aOldLayoutName)); - - const SfxItemSet *pArgs = rReq.GetArgs (); if (pArgs) diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx index 57536ef76721..6e46e4b8c2c1 100644 --- a/sd/source/ui/func/fuprobjs.cxx +++ b/sd/source/ui/func/fuprobjs.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "fuprobjs.hxx" #include <vcl/msgbox.hxx> @@ -25,7 +24,6 @@ #include <editeng/outliner.hxx> #include <svl/smplhint.hxx> - #include "app.hrc" #include "res_bmp.hrc" #include "strings.hrc" @@ -47,7 +45,6 @@ namespace sd { TYPEINIT1( FuPresentationObjects, FuPoor ); - FuPresentationObjects::FuPresentationObjects ( ViewShell* pViewSh, ::sd::Window* pWin, diff --git a/sd/source/ui/func/fusearch.cxx b/sd/source/ui/func/fusearch.cxx index 704550c353cc..eb0003520830 100644 --- a/sd/source/ui/func/fusearch.cxx +++ b/sd/source/ui/func/fusearch.cxx @@ -100,7 +100,6 @@ FuSearch::~FuSearch() delete pSdOutliner; } - void FuSearch::SearchAndReplace( const SvxSearchItem* pSearchItem ) { ViewShellBase* pBase = PTR_CAST(ViewShellBase, SfxViewShell::Current()); @@ -141,8 +140,6 @@ void FuSearch::SearchAndReplace( const SvxSearchItem* pSearchItem ) } } - - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index 032aab75fffd..354dc619b001 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -881,7 +881,6 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) mpView->MarkObj(aPnt, nHitLog, false, rMEvt.IsMod1()); } - ForcePointer(&rMEvt); pHdl = NULL; mpWindow->ReleaseMouse(); @@ -995,7 +994,6 @@ bool FuSelection::KeyInput(const KeyEvent& rKEvt) } - void FuSelection::Activate() { SdrDragMode eMode; @@ -1135,14 +1133,11 @@ void FuSelection::Activate() FuDraw::Activate(); } - - void FuSelection::Deactivate() { FuDraw::Deactivate(); } - void FuSelection::SelectionHasChanged() { bSelectionChanged = true; @@ -1161,7 +1156,6 @@ void FuSelection::SelectionHasChanged() mpViewShell->GetViewShellBase().GetToolBarManager()->SelectionHasChanged(*mpViewShell, *mpView); } - /** * Set current bezier edit mode */ @@ -1462,8 +1456,6 @@ bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) return bAnimated; } - - /** is called when the current function should be aborted. <p> This is used when a function gets a KEY_ESCAPE but can also be called directly. @@ -1484,9 +1476,6 @@ bool FuSelection::cancel() } } - - - SdrObject* FuSelection::pickObject (const Point& rTestPoint) { SdrObject* pObject = NULL; diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx index 6f60d3cc98d7..ec78699c0555 100644 --- a/sd/source/ui/func/fusldlg.cxx +++ b/sd/source/ui/func/fusldlg.cxx @@ -40,7 +40,6 @@ namespace sd { TYPEINIT1( FuSlideShowDlg, FuPoor ); - FuSlideShowDlg::FuSlideShowDlg ( ViewShell* pViewSh, ::sd::Window* pWin, diff --git a/sd/source/ui/func/fusnapln.cxx b/sd/source/ui/func/fusnapln.cxx index 9d9c7c63ed47..7a0570342e2b 100644 --- a/sd/source/ui/func/fusnapln.cxx +++ b/sd/source/ui/func/fusnapln.cxx @@ -17,13 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "fusnapln.hxx" #include <svl/aeitem.hxx> #include <vcl/msgbox.hxx> #include <sfx2/request.hxx> - #include "strings.hrc" #include "sdattr.hxx" @@ -86,7 +84,6 @@ void FuSnapLine::DoExecute( SfxRequest& rReq ) aLinePos = static_cast<DrawViewShell*>(mpViewShell)->GetMousePos(); static_cast<DrawViewShell*>(mpViewShell)->SetMousePosFreezed( false ); - if ( aLinePos.X() >= 0 ) { aLinePos = mpWindow->PixelToLogic(aLinePos); diff --git a/sd/source/ui/func/fusumry.cxx b/sd/source/ui/func/fusumry.cxx index 0c5731acef74..4789946d578f 100644 --- a/sd/source/ui/func/fusumry.cxx +++ b/sd/source/ui/func/fusumry.cxx @@ -223,7 +223,6 @@ void FuSummaryPage::DoExecute( SfxRequest& ) } } - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index 3613a7b39342..e4268088a576 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -131,7 +131,6 @@ static sal_uInt16 SidArray[] = { TYPEINIT1( FuText, FuConstruct ); - static bool bTestText = false; /** @@ -397,7 +396,6 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt) aDragTimer.Start(); } - if ( ! rMEvt.IsRight()) { // we need to pick again since SdrEndTextEdit can rebuild the handles list @@ -965,8 +963,6 @@ bool FuText::KeyInput(const KeyEvent& rKEvt) return (bReturn); } - - void FuText::Activate() { mpView->SetQuickTextEditMode(mpViewShell->GetFrameView()->IsQuickEdit()); @@ -986,7 +982,6 @@ void FuText::Activate() mpView->SetEditMode(SDREDITMODE_EDIT); } - void FuText::Deactivate() { OutlinerView* pOLV = mpView->GetTextEditOutlinerView(); @@ -999,7 +994,6 @@ void FuText::Deactivate() FuConstruct::Deactivate(); } - /** * Sets the object into the edit mode. */ @@ -1331,9 +1325,6 @@ SdrObject* FuText::CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rR return pObj; } - - - /** is called when the current function should be aborted. <p> This is used when a function gets a KEY_ESCAPE but can also be called directly. diff --git a/sd/source/ui/func/futxtatt.cxx b/sd/source/ui/func/futxtatt.cxx index 5db7226dfbb2..4c61d4dbad8b 100644 --- a/sd/source/ui/func/futxtatt.cxx +++ b/sd/source/ui/func/futxtatt.cxx @@ -80,7 +80,6 @@ void FuTextAttrDlg::DoExecute( SfxRequest& rReq ) mpView->SetAttributes( *pArgs ); } - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/func/fuvect.cxx b/sd/source/ui/func/fuvect.cxx index 97e3f1101b7c..97e880521f63 100644 --- a/sd/source/ui/func/fuvect.cxx +++ b/sd/source/ui/func/fuvect.cxx @@ -23,7 +23,6 @@ #include <vcl/msgbox.hxx> #include <svx/svdedtv.hxx> - #include "View.hxx" #include "ViewShell.hxx" #include "Window.hxx" diff --git a/sd/source/ui/func/sdundogr.cxx b/sd/source/ui/func/sdundogr.cxx index ed3217f38c67..688c08d0c3dc 100644 --- a/sd/source/ui/func/sdundogr.cxx +++ b/sd/source/ui/func/sdundogr.cxx @@ -19,7 +19,6 @@ #include "sdundogr.hxx" - TYPEINIT1(SdUndoGroup, SdUndoAction); SdUndoGroup::~SdUndoGroup() diff --git a/sd/source/ui/func/smarttag.cxx b/sd/source/ui/func/smarttag.cxx index 43523f16f1c4..5de61d5a9694 100644 --- a/sd/source/ui/func/smarttag.cxx +++ b/sd/source/ui/func/smarttag.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ViewShell.hxx" #include "smarttag.hxx" #include "Window.hxx" @@ -26,8 +25,6 @@ namespace sd { - - SmartTag::SmartTag( ::sd::View& rView ) : mrView( rView ) , mbSelected( false ) @@ -36,14 +33,10 @@ SmartTag::SmartTag( ::sd::View& rView ) mrView.getSmartTags().add( xThis ); } - - SmartTag::~SmartTag() { } - - bool SmartTag::MouseButtonDown( const MouseEvent&, SmartHdl& ) { return false; @@ -67,93 +60,64 @@ bool SmartTag::Command( const CommandEvent& /*rCEvt*/ ) return false; } - - void SmartTag::addCustomHandles( SdrHdlList& /*rHandlerList*/ ) { } - - void SmartTag::select() { mbSelected = true; } - - void SmartTag::deselect() { mbSelected = false; } - - - - - void SmartTag::disposing() { SmartTagReference xThis( this ); mrView.getSmartTags().remove( xThis ); } - - bool SmartTag::getContext( SdrViewContext& /*rContext*/ ) { return false; } - - sal_uLong SmartTag::GetMarkablePointCount() const { return 0; } - - sal_uLong SmartTag::GetMarkedPointCount() const { return 0; } - - bool SmartTag::MarkPoint(SdrHdl& /*rHdl*/, bool /*bUnmark*/ ) { return false; } - - bool SmartTag::MarkPoints(const Rectangle* /*pRect*/, bool /*bUnmark*/ ) { return false; } - - void SmartTag::CheckPossibilities() { } - - SmartTagSet::SmartTagSet( View& rView ) : mrView( rView ) { } - - SmartTagSet::~SmartTagSet() { } - - void SmartTagSet::add( const SmartTagReference& xTag ) { maSet.insert( xTag ); @@ -166,8 +130,6 @@ void SmartTagSet::add( const SmartTagReference& xTag ) mxSelectedTag.clear(); } - - void SmartTagSet::remove( const SmartTagReference& xTag ) { std::set< SmartTagReference >::iterator aIter( maSet.find( xTag ) ); @@ -182,8 +144,6 @@ void SmartTagSet::remove( const SmartTagReference& xTag ) mxSelectedTag.clear(); } - - void SmartTagSet::Dispose() { std::set< SmartTagReference > aSet; @@ -195,8 +155,6 @@ void SmartTagSet::Dispose() mxSelectedTag.clear(); } - - void SmartTagSet::select( const SmartTagReference& xTag ) { if( mxSelectedTag != xTag ) @@ -214,8 +172,6 @@ void SmartTagSet::select( const SmartTagReference& xTag ) } } - - void SmartTagSet::deselect() { if( mxSelectedTag.is() ) @@ -227,8 +183,6 @@ void SmartTagSet::deselect() } } - - bool SmartTagSet::MouseButtonDown( const MouseEvent& rMEvt ) { Point aMDPos( mrView.GetViewShell()->GetActiveWindow()->PixelToLogic( rMEvt.GetPosPixel() ) ); @@ -253,8 +207,6 @@ bool SmartTagSet::MouseButtonDown( const MouseEvent& rMEvt ) return false; } - - bool SmartTagSet::KeyInput( const KeyEvent& rKEvt ) { if( mxSelectedTag.is() ) @@ -271,12 +223,9 @@ bool SmartTagSet::KeyInput( const KeyEvent& rKEvt ) } } - return false; } - - bool SmartTagSet::RequestHelp( const HelpEvent& rHEvt ) { Point aMDPos( mrView.GetViewShell()->GetActiveWindow()->PixelToLogic( rHEvt.GetMousePosPixel() ) ); @@ -296,8 +245,6 @@ bool SmartTagSet::RequestHelp( const HelpEvent& rHEvt ) return false; } - - /** returns true if the SmartTag consumes this event. */ bool SmartTagSet::Command( const CommandEvent& rCEvt ) { @@ -327,8 +274,6 @@ bool SmartTagSet::Command( const CommandEvent& rCEvt ) return false; } - - void SmartTagSet::addCustomHandles( SdrHdlList& rHandlerList ) { if( !maSet.empty() ) @@ -338,8 +283,6 @@ void SmartTagSet::addCustomHandles( SdrHdlList& rHandlerList ) } } - - /** returns true if the currently selected smart tag has a special context, returned in rContext. */ bool SmartTagSet::getContext( SdrViewContext& rContext ) const @@ -350,17 +293,13 @@ bool SmartTagSet::getContext( SdrViewContext& rContext ) const return false; } - // support point editing - bool SmartTagSet::HasMarkablePoints() const { return GetMarkablePointCount() != 0 ? sal_True : sal_False; } - - sal_uLong SmartTagSet::GetMarkablePointCount() const { if( mxSelectedTag.is() ) @@ -368,15 +307,11 @@ sal_uLong SmartTagSet::GetMarkablePointCount() const return 0; } - - bool SmartTagSet::HasMarkedPoints() const { return GetMarkedPointCount() != 0 ? sal_True : sal_False; } - - sal_uLong SmartTagSet::GetMarkedPointCount() const { if( mxSelectedTag.is() ) @@ -385,8 +320,6 @@ sal_uLong SmartTagSet::GetMarkedPointCount() const return 0; } - - bool SmartTagSet::IsPointMarkable(const SdrHdl& rHdl) const { const SmartHdl* pSmartHdl = dynamic_cast< const SmartHdl* >( &rHdl ); @@ -394,8 +327,6 @@ bool SmartTagSet::IsPointMarkable(const SdrHdl& rHdl) const return pSmartHdl && pSmartHdl->isMarkable(); } - - bool SmartTagSet::MarkPoint(SdrHdl& rHdl, bool bUnmark ) { if( mxSelectedTag.is() ) @@ -404,8 +335,6 @@ bool SmartTagSet::MarkPoint(SdrHdl& rHdl, bool bUnmark ) return false; } - - bool SmartTagSet::MarkPoints(const Rectangle* pRect, bool bUnmark) { if( mxSelectedTag.is() ) @@ -413,16 +342,12 @@ bool SmartTagSet::MarkPoints(const Rectangle* pRect, bool bUnmark) return false; } - - void SmartTagSet::CheckPossibilities() { if( mxSelectedTag.is() ) mxSelectedTag->CheckPossibilities(); } - - SmartHdl::SmartHdl( const SmartTagReference& xTag, SdrObject* pObject, const Point& rPnt, SdrHdlKind eNewKind /*=HDL_MOVE*/ ) : SdrHdl( rPnt, eNewKind ) , mxTag( xTag ) @@ -430,16 +355,12 @@ SmartHdl::SmartHdl( const SmartTagReference& xTag, SdrObject* pObject, const Poi SetObj( pObject ); } - - SmartHdl::SmartHdl( const SmartTagReference& xTag, const Point& rPnt, SdrHdlKind eNewKind /*=HDL_MOVE*/ ) : SdrHdl( rPnt, eNewKind ) , mxTag( xTag ) { } - - bool SmartHdl::isMarkable() const { return false; diff --git a/sd/source/ui/func/undoback.cxx b/sd/source/ui/func/undoback.cxx index b6436608f664..bfb421bdad9d 100644 --- a/sd/source/ui/func/undoback.cxx +++ b/sd/source/ui/func/undoback.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "undoback.hxx" #include "sdpage.hxx" #include "sdresid.hxx" @@ -26,8 +25,6 @@ TYPEINIT1( SdBackgroundObjUndoAction, SdUndoAction ); - - SdBackgroundObjUndoAction::SdBackgroundObjUndoAction( SdDrawDocument& rDoc, SdPage& rPage, @@ -40,15 +37,11 @@ SdBackgroundObjUndoAction::SdBackgroundObjUndoAction( SetComment( aString ); } - - SdBackgroundObjUndoAction::~SdBackgroundObjUndoAction() { delete mpItemSet; } - - void SdBackgroundObjUndoAction::ImplRestoreBackgroundObj() { SfxItemSet* pNew = new SfxItemSet(mrPage.getSdrPageProperties().GetItemSet()); @@ -61,22 +54,16 @@ void SdBackgroundObjUndoAction::ImplRestoreBackgroundObj() mrPage.ActionChanged(); } - - void SdBackgroundObjUndoAction::Undo() { ImplRestoreBackgroundObj(); } - - void SdBackgroundObjUndoAction::Redo() { ImplRestoreBackgroundObj(); } - - SdUndoAction* SdBackgroundObjUndoAction::Clone() const { return new SdBackgroundObjUndoAction(*mpDoc, mrPage, *mpItemSet); diff --git a/sd/source/ui/func/undolayer.cxx b/sd/source/ui/func/undolayer.cxx index 5954a2c9732d..33897e1dc33c 100644 --- a/sd/source/ui/func/undolayer.cxx +++ b/sd/source/ui/func/undolayer.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "undolayer.hxx" #include "DrawDocShell.hxx" diff --git a/sd/source/ui/func/undopage.cxx b/sd/source/ui/func/undopage.cxx index f8de55a85149..70348204a8d7 100644 --- a/sd/source/ui/func/undopage.cxx +++ b/sd/source/ui/func/undopage.cxx @@ -29,13 +29,10 @@ #include "drawview.hxx" #include <svx/svdpagv.hxx> - - TYPEINIT1(SdPageFormatUndoAction, SdUndoAction); TYPEINIT1(SdPageLRUndoAction, SdUndoAction); TYPEINIT1(SdPageULUndoAction, SdUndoAction); - SdPageFormatUndoAction::~SdPageFormatUndoAction() { } diff --git a/sd/source/ui/func/unmovss.cxx b/sd/source/ui/func/unmovss.cxx index d742df59f237..744b38bd820b 100644 --- a/sd/source/ui/func/unmovss.cxx +++ b/sd/source/ui/func/unmovss.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "unmovss.hxx" #include "DrawDocShell.hxx" #include "drawdoc.hxx" @@ -89,5 +88,4 @@ OUString SdMoveStyleSheetsUndoAction::GetComment() const return OUString(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/func/unoaprms.cxx b/sd/source/ui/func/unoaprms.cxx index 9f5321e18e5e..08bf3e05c4ad 100644 --- a/sd/source/ui/func/unoaprms.cxx +++ b/sd/source/ui/func/unoaprms.cxx @@ -21,10 +21,8 @@ #include "unoaprms.hxx" #include "anminfo.hxx" - TYPEINIT1(SdAnimationPrmsUndoAction, SdUndoAction); - void SdAnimationPrmsUndoAction::Undo() { // no new info created: restore data @@ -101,5 +99,4 @@ SdAnimationPrmsUndoAction::~SdAnimationPrmsUndoAction() { } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/func/unprlout.cxx b/sd/source/ui/func/unprlout.cxx index a0ef9e1e4430..edfdaac825af 100644 --- a/sd/source/ui/func/unprlout.cxx +++ b/sd/source/ui/func/unprlout.cxx @@ -24,10 +24,8 @@ #include "drawdoc.hxx" #include "sdresid.hxx" - TYPEINIT1(SdPresentationLayoutUndoAction, SdUndoAction); - SdPresentationLayoutUndoAction::SdPresentationLayoutUndoAction( SdDrawDocument* pTheDoc, const OUString& aTheOldLayoutName, @@ -72,6 +70,4 @@ OUString SdPresentationLayoutUndoAction::GetComment() const return aComment; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx index 2e857d08f03f..70c3e44530fc 100644 --- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx +++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx @@ -52,7 +52,6 @@ class VclSimpleEvent; namespace accessibility { - /** Base class for the various document views of the Draw and Impress applications. @@ -163,7 +162,6 @@ public: throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; - //===== XAccessibleComponent ============================================ virtual ::com::sun::star::uno::Reference< @@ -183,7 +181,6 @@ public: virtual ::com::sun::star::awt::Size SAL_CALL getSize (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //===== XInterface ====================================================== virtual com::sun::star::uno::Any SAL_CALL @@ -198,7 +195,6 @@ public: release (void) throw () SAL_OVERRIDE; - //===== XServiceInfo ==================================================== /** Returns an identifier for the implementation of this object. @@ -211,28 +207,24 @@ public: getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //===== XTypeProvider =================================================== virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL getTypes (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //===== lang::XEventListener ============================================ virtual void SAL_CALL disposing (const ::com::sun::star::lang::EventObject& rEventObject) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //===== XPropertyChangeListener ========================================= virtual void SAL_CALL propertyChange (const ::com::sun::star::beans::PropertyChangeEvent& rEventObject) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //===== XWindowListener ================================================= virtual void SAL_CALL diff --git a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx index f95b6943a144..45fe36a61cbb 100644 --- a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx +++ b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx @@ -26,7 +26,6 @@ namespace accessibility { - /** This class makes draw documents in the general view modes accessible. It passes all shapes on the current draw page to a children manager and additionally creates a new shape that @@ -55,7 +54,6 @@ public: */ virtual void Init (void) SAL_OVERRIDE; - //===== IAccessibleViewForwarderListener ================================ virtual void ViewForwarderChanged (ChangeType aChangeType, @@ -82,7 +80,6 @@ public: disposing (const ::com::sun::star::lang::EventObject& rEventObject) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //===== XPropertyChangeListener ========================================= virtual void SAL_CALL @@ -123,7 +120,6 @@ protected: getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual bool implIsSelected( sal_Int32 nAccessibleChildIndex ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/AccessibleOutlineView.hxx b/sd/source/ui/inc/AccessibleOutlineView.hxx index dffa987c9967..2c32bb123130 100644 --- a/sd/source/ui/inc/AccessibleOutlineView.hxx +++ b/sd/source/ui/inc/AccessibleOutlineView.hxx @@ -30,7 +30,6 @@ class Window; namespace accessibility { - /** This class makes the Impress outline view accessible. Please see the documentation of the base class for further @@ -56,7 +55,6 @@ public: */ virtual void Init (void) SAL_OVERRIDE; - //===== IAccessibleViewForwarderListener ================================ virtual void ViewForwarderChanged (ChangeType aChangeType, @@ -108,7 +106,6 @@ public: propertyChange (const ::com::sun::star::beans::PropertyChangeEvent& rEventObject) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - protected: // overridden, as we hold the listeners ourselves diff --git a/sd/source/ui/inc/AccessiblePageShape.hxx b/sd/source/ui/inc/AccessiblePageShape.hxx index 2c34c32077b6..d0b83caf1253 100644 --- a/sd/source/ui/inc/AccessiblePageShape.hxx +++ b/sd/source/ui/inc/AccessiblePageShape.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SD_SOURCE_UI_INC_ACCESSIBLEPAGESHAPE_HXX #define INCLUDED_SD_SOURCE_UI_INC_ACCESSIBLEPAGESHAPE_HXX @@ -96,7 +95,6 @@ public: getAccessibleChild (sal_Int32 nIndex) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //===== XAccessibleComponent ============================================ virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds (void) @@ -114,7 +112,6 @@ public: dispose (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //===== XServiceInfo ==================================================== virtual OUString SAL_CALL @@ -125,14 +122,12 @@ public: getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //===== lang::XEventListener ============================================ virtual void SAL_CALL disposing (const ::com::sun::star::lang::EventObject& Source) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - using AccessibleShape::disposing; protected: diff --git a/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx b/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx index 3942796c3384..4a02162c971a 100644 --- a/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx +++ b/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SD_SOURCE_UI_INC_ACCESSIBLEPRESENTATIONGRAPHICSHAPE_HXX #define INCLUDED_SD_SOURCE_UI_INC_ACCESSIBLEPRESENTATIONGRAPHICSHAPE_HXX diff --git a/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx b/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx index 829c1e1e3a51..46f72c1cb3b9 100644 --- a/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx +++ b/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SD_SOURCE_UI_INC_ACCESSIBLEPRESENTATIONOLESHAPE_HXX #define INCLUDED_SD_SOURCE_UI_INC_ACCESSIBLEPRESENTATIONOLESHAPE_HXX diff --git a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx index d4a7270b51a7..137d6e82668b 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx @@ -39,7 +39,6 @@ class SlideSorter; namespace accessibility { - typedef ::cppu::PartialWeakComponentImplHelper5< ::com::sun::star::accessibility::XAccessible, ::com::sun::star::accessibility::XAccessibleEventBroadcaster, @@ -47,7 +46,6 @@ typedef ::cppu::PartialWeakComponentImplHelper5< ::com::sun::star::accessibility::XAccessibleComponent, ::com::sun::star::lang::XServiceInfo > AccessibleSlideSorterObjectBase; - /** This class makes page objects of the slide sorter accessible. */ class AccessibleSlideSorterObject @@ -102,7 +100,6 @@ public: getAccessibleContext (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //===== XAccessibleEventBroadcaster ======================================= virtual void SAL_CALL addAccessibleEventListener( @@ -158,7 +155,6 @@ public: throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception) SAL_OVERRIDE; - //===== XAccessibleComponent ================================================ virtual sal_Bool SAL_CALL containsPoint ( @@ -191,8 +187,6 @@ public: virtual sal_Int32 SAL_CALL getBackground (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - //===== XServiceInfo ==================================================== /** Returns an identifier for the implementation of this object. @@ -213,7 +207,6 @@ public: getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - private: ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> mxParent; @@ -238,8 +231,6 @@ private: bool IsDisposed (void); }; - - } // end of namespace ::accessibility #endif diff --git a/sd/source/ui/inc/AccessibleSlideSorterView.hxx b/sd/source/ui/inc/AccessibleSlideSorterView.hxx index 9139740632e1..f5c9d66626a1 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterView.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterView.hxx @@ -32,7 +32,6 @@ #include <com/sun/star/awt/XFocusListener.hpp> #include <com/sun/star/document/XEventListener.hpp> - #include <memory> class Window; @@ -43,7 +42,6 @@ class SlideSorter; namespace accessibility { - class AccessibleSlideSorterObject; typedef ::cppu::PartialWeakComponentImplHelper6< @@ -107,7 +105,6 @@ public: getAccessibleContext (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //===== XAccessibleEventBroadcaster ======================================= virtual void SAL_CALL addAccessibleEventListener( @@ -233,7 +230,6 @@ public: virtual sal_Int32 SAL_CALL getBackground (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //===== XAccessibleSelection ============================================== virtual void SAL_CALL @@ -269,7 +265,6 @@ public: throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //===== XServiceInfo ==================================================== /** Returns an identifier for the implementation of this object. diff --git a/sd/source/ui/inc/AccessibleViewForwarder.hxx b/sd/source/ui/inc/AccessibleViewForwarder.hxx index 0f4b4d44a070..c0567bf0b9e7 100644 --- a/sd/source/ui/inc/AccessibleViewForwarder.hxx +++ b/sd/source/ui/inc/AccessibleViewForwarder.hxx @@ -27,7 +27,6 @@ class OutputDevice; namespace accessibility { - /** <p>This class provides the means to transform between internal coordinates and screen coordinates without giving direct access to the underlying view. It represents a certain window. A call to diff --git a/sd/source/ui/inc/Client.hxx b/sd/source/ui/inc/Client.hxx index 41168e0e5ab6..24f09783c46c 100644 --- a/sd/source/ui/inc/Client.hxx +++ b/sd/source/ui/inc/Client.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SD_SOURCE_UI_INC_CLIENT_HXX #define INCLUDED_SD_SOURCE_UI_INC_CLIENT_HXX - #include <sfx2/ipclient.hxx> class SdrGrafObj; class SdrOle2Obj; @@ -30,7 +29,6 @@ namespace sd { class ViewShell; - class Client : public SfxInPlaceClient { ViewShell* mpViewShell; diff --git a/sd/source/ui/inc/DocumentRenderer.hxx b/sd/source/ui/inc/DocumentRenderer.hxx index ac17d83da022..403825e45935 100644 --- a/sd/source/ui/inc/DocumentRenderer.hxx +++ b/sd/source/ui/inc/DocumentRenderer.hxx @@ -35,7 +35,6 @@ namespace { > DocumentRendererInterfaceBase; } - class DocumentRenderer : protected ::cppu::BaseMutex, public DocumentRendererInterfaceBase diff --git a/sd/source/ui/inc/DrawController.hxx b/sd/source/ui/inc/DrawController.hxx index 492732f329a4..4c5cb0ec5154 100644 --- a/sd/source/ui/inc/DrawController.hxx +++ b/sd/source/ui/inc/DrawController.hxx @@ -65,7 +65,6 @@ class DrawSubController; class ViewShellBase; class ViewShell; - /** The DrawController is the UNO controller for Impress and Draw. It relies objects that implement the DrawSubController interface for view specific behaviour. The life time of the DrawController is roughly that @@ -209,19 +208,16 @@ public: getCurrentPage (void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // lang::XEventListener virtual void SAL_CALL disposing (const ::com::sun::star::lang::EventObject& rEventObject) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // view::XSelectionChangeListener virtual void SAL_CALL selectionChanged (const ::com::sun::star::lang::EventObject& rEvent) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XControllerManager virtual css::uno::Reference<css::drawing::framework::XConfigurationController> SAL_CALL @@ -232,7 +228,6 @@ public: getModuleController (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething (const com::sun::star::uno::Sequence<sal_Int8>& rId) diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index 4ce23492310b..4583ada7f556 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -187,7 +187,6 @@ public: */ bool IsNewPageNameValid( OUString & rInOutPageName, bool bResetStringIfStandardName = false ); - /** Return the reference device for the current document. When the inherited implementation returns a device then this is passed to the caller. Otherwise the returned value depends on the printer diff --git a/sd/source/ui/inc/DrawSubController.hxx b/sd/source/ui/inc/DrawSubController.hxx index 5a2f9accfe74..fbb757ee6087 100644 --- a/sd/source/ui/inc/DrawSubController.hxx +++ b/sd/source/ui/inc/DrawSubController.hxx @@ -44,7 +44,6 @@ namespace sd { } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index c550e808234f..125d007c6e78 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -509,7 +509,6 @@ private: ::std::auto_ptr< ViewOverlayManager > mpViewOverlayManager; }; - } // end of namespace sd #endif diff --git a/sd/source/ui/inc/EventMultiplexer.hxx b/sd/source/ui/inc/EventMultiplexer.hxx index 45d82493be94..7b8cab5d3660 100644 --- a/sd/source/ui/inc/EventMultiplexer.hxx +++ b/sd/source/ui/inc/EventMultiplexer.hxx @@ -138,7 +138,6 @@ public: const void* pUserData); }; - /** This convenience class makes it easy to listen to various events that originally are broadcasted via different channels. diff --git a/sd/source/ui/inc/GraphicViewShellBase.hxx b/sd/source/ui/inc/GraphicViewShellBase.hxx index 4215754ae362..d0a58861cd78 100644 --- a/sd/source/ui/inc/GraphicViewShellBase.hxx +++ b/sd/source/ui/inc/GraphicViewShellBase.hxx @@ -22,7 +22,6 @@ #include "ViewShellBase.hxx" - namespace sd { /** This class exists to be able to register another factory that diff --git a/sd/source/ui/inc/ImpressViewShellBase.hxx b/sd/source/ui/inc/ImpressViewShellBase.hxx index 6f681c797b3a..3538473b386e 100644 --- a/sd/source/ui/inc/ImpressViewShellBase.hxx +++ b/sd/source/ui/inc/ImpressViewShellBase.hxx @@ -22,7 +22,6 @@ #include "ViewShellBase.hxx" - namespace sd { /** This class implements a few features that exist only for the Impress diff --git a/sd/source/ui/inc/MasterPageObserver.hxx b/sd/source/ui/inc/MasterPageObserver.hxx index 744d3223cb5b..b10b4de17712 100644 --- a/sd/source/ui/inc/MasterPageObserver.hxx +++ b/sd/source/ui/inc/MasterPageObserver.hxx @@ -87,9 +87,6 @@ private: MasterPageObserver& operator= (const MasterPageObserver&); }; - - - /** Objects of this class are sent to listeners of the MasterPageObserver singleton when the list of master pages of one document has changed. */ diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx index 21b29542e7ec..48f7f788c6fa 100644 --- a/sd/source/ui/inc/OutlineView.hxx +++ b/sd/source/ui/inc/OutlineView.hxx @@ -139,7 +139,6 @@ public: sal_uInt16 nPage = SDRPAGE_NOTFOUND, sal_uInt16 nLayer = SDRPAGE_NOTFOUND) SAL_OVERRIDE; - // Re-implement GetScriptType for this view to get correct results virtual sal_uInt16 GetScriptType() const SAL_OVERRIDE; diff --git a/sd/source/ui/inc/OutlineViewShellBase.hxx b/sd/source/ui/inc/OutlineViewShellBase.hxx index 6dafd4d23394..2cbabd04c0da 100644 --- a/sd/source/ui/inc/OutlineViewShellBase.hxx +++ b/sd/source/ui/inc/OutlineViewShellBase.hxx @@ -22,7 +22,6 @@ #include "ImpressViewShellBase.hxx" - namespace sd { /** This class exists to be able to register a factory that diff --git a/sd/source/ui/inc/OutlinerIteratorImpl.hxx b/sd/source/ui/inc/OutlinerIteratorImpl.hxx index 0ddd4e308065..eb506187ecec 100644 --- a/sd/source/ui/inc/OutlinerIteratorImpl.hxx +++ b/sd/source/ui/inc/OutlinerIteratorImpl.hxx @@ -120,9 +120,6 @@ protected: bool mbDirectionIsForward; }; - - - /** Iterator all objects that belong to the current mark list a.k.a. selection. It is assumed that all marked objects belong to the same page. It is further assumed that the mark list does not change @@ -168,7 +165,6 @@ private: IteratorImplBase& operator= (const IteratorImplBase& rIterator); }; - /** Iterator for iteration over all objects in a single view. On reaching the last object on the last page (or the first object on the first page) the view is *not* switched. Further calls to the @@ -224,9 +220,6 @@ private: ViewIteratorImpl& operator= (const ViewIteratorImpl&){return *this;}; }; - - - /** Iterator for iteration over all objects in all views. It automatically switches views when reaching the end/beginning of a view. @@ -256,7 +249,6 @@ private: DocumentIteratorImpl& operator= (const DocumentIteratorImpl& ){return *this;}; }; - } } // end of namespace ::sd::outliner #endif diff --git a/sd/source/ui/inc/PaneChildWindows.hxx b/sd/source/ui/inc/PaneChildWindows.hxx index 556fb827e8b1..70d0feff13d5 100644 --- a/sd/source/ui/inc/PaneChildWindows.hxx +++ b/sd/source/ui/inc/PaneChildWindows.hxx @@ -40,9 +40,6 @@ public: virtual ~PaneChildWindow (void); }; - - - class LeftPaneImpressChildWindow : public PaneChildWindow { @@ -52,9 +49,6 @@ public: SFX_DECL_CHILDWINDOW_WITHID(LeftPaneImpressChildWindow); }; - - - class LeftPaneDrawChildWindow : public PaneChildWindow { @@ -64,7 +58,6 @@ public: SFX_DECL_CHILDWINDOW_WITHID(LeftPaneDrawChildWindow); }; - } // end of namespace ::sd #endif diff --git a/sd/source/ui/inc/PaneShells.hxx b/sd/source/ui/inc/PaneShells.hxx index 151a0a7de908..51dc0f7e9599 100644 --- a/sd/source/ui/inc/PaneShells.hxx +++ b/sd/source/ui/inc/PaneShells.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SD_SOURCE_UI_INC_PANESHELLS_HXX #define INCLUDED_SD_SOURCE_UI_INC_PANESHELLS_HXX - #include <sfx2/module.hxx> #include <sfx2/shell.hxx> #include "glob.hxx" diff --git a/sd/source/ui/inc/PresentationViewShellBase.hxx b/sd/source/ui/inc/PresentationViewShellBase.hxx index 3a17c1388d99..3eddaaceb19d 100644 --- a/sd/source/ui/inc/PresentationViewShellBase.hxx +++ b/sd/source/ui/inc/PresentationViewShellBase.hxx @@ -22,7 +22,6 @@ #include "ViewShellBase.hxx" - namespace sd { /** This class exists to be able to register another factory that diff --git a/sd/source/ui/inc/PreviewRenderer.hxx b/sd/source/ui/inc/PreviewRenderer.hxx index d97b3223fca3..86442f152cc7 100644 --- a/sd/source/ui/inc/PreviewRenderer.hxx +++ b/sd/source/ui/inc/PreviewRenderer.hxx @@ -26,7 +26,6 @@ #include <svl/listener.hxx> #include <memory> - class OutputDevice; class SdPage; class VirtualDevice; @@ -36,7 +35,6 @@ namespace sd { class DrawDocShell; class DrawView; - class PreviewRenderer : public SfxListener { diff --git a/sd/source/ui/inc/Ruler.hxx b/sd/source/ui/inc/Ruler.hxx index b6d920f445e2..69b30a5d6065 100644 --- a/sd/source/ui/inc/Ruler.hxx +++ b/sd/source/ui/inc/Ruler.hxx @@ -20,10 +20,8 @@ #ifndef INCLUDED_SD_SOURCE_UI_INC_RULER_HXX #define INCLUDED_SD_SOURCE_UI_INC_RULER_HXX - #include <svx/ruler.hxx> - namespace sd { class DrawViewShell; diff --git a/sd/source/ui/inc/SdUnoDrawView.hxx b/sd/source/ui/inc/SdUnoDrawView.hxx index 2472340e7421..3a39b8733eaf 100644 --- a/sd/source/ui/inc/SdUnoDrawView.hxx +++ b/sd/source/ui/inc/SdUnoDrawView.hxx @@ -66,7 +66,6 @@ public: const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XDrawView virtual void SAL_CALL setCurrentPage ( @@ -77,7 +76,6 @@ public: virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage (void) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XFastPropertySet virtual void SAL_CALL setFastPropertyValue ( diff --git a/sd/source/ui/inc/SdUnoOutlineView.hxx b/sd/source/ui/inc/SdUnoOutlineView.hxx index 85e468c94798..d72fb3e10652 100644 --- a/sd/source/ui/inc/SdUnoOutlineView.hxx +++ b/sd/source/ui/inc/SdUnoOutlineView.hxx @@ -24,7 +24,6 @@ #include <cppuhelper/basemutex.hxx> #include <com/sun/star/lang/EventObject.hpp> - namespace sd { class OutlineViewShell; @@ -42,7 +41,6 @@ public: virtual void SAL_CALL disposing (void) SAL_OVERRIDE; - // XSelectionSupplier virtual sal_Bool SAL_CALL select ( @@ -61,7 +59,6 @@ public: const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XDrawView virtual void SAL_CALL setCurrentPage ( @@ -71,7 +68,6 @@ public: virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage (void) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XFastPropertySet virtual void SAL_CALL setFastPropertyValue ( diff --git a/sd/source/ui/inc/SdUnoSlideView.hxx b/sd/source/ui/inc/SdUnoSlideView.hxx index 4d9652c8312b..38f755ee5e21 100644 --- a/sd/source/ui/inc/SdUnoSlideView.hxx +++ b/sd/source/ui/inc/SdUnoSlideView.hxx @@ -59,7 +59,6 @@ public: const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XDrawView virtual void SAL_CALL setCurrentPage ( @@ -70,7 +69,6 @@ public: getCurrentPage (void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XFastPropertySet virtual void SAL_CALL setFastPropertyValue ( diff --git a/sd/source/ui/inc/SidebarPanelId.hxx b/sd/source/ui/inc/SidebarPanelId.hxx index 44a90b6aeb46..ceedd3b45429 100644 --- a/sd/source/ui/inc/SidebarPanelId.hxx +++ b/sd/source/ui/inc/SidebarPanelId.hxx @@ -24,7 +24,6 @@ namespace rtl class OUString; } - namespace sd { namespace sidebar { /** List of top level panels that can be shown in the task pane. @@ -46,7 +45,6 @@ enum PanelId } } // namespace sd::sidebar - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx index 106bfa22b954..a26a49be234f 100644 --- a/sd/source/ui/inc/SlideSorter.hxx +++ b/sd/source/ui/inc/SlideSorter.hxx @@ -30,12 +30,10 @@ #include <boost/scoped_ptr.hpp> #include <boost/current_function.hpp> - class ScrollBar; class ScrollBarBox; class Window; - namespace sd { class ViewShell; class ViewShellBase; @@ -57,10 +55,8 @@ class SlotManager; class Properties; } } } - typedef ::boost::shared_ptr<sd::Window> SharedSdWindow; - namespace sd { namespace slidesorter { /** Show previews for all the slides in a document and allow the user to diff --git a/sd/source/ui/inc/SlideSorterViewShellBase.hxx b/sd/source/ui/inc/SlideSorterViewShellBase.hxx index 24b2173942c4..b76dc738c7cc 100644 --- a/sd/source/ui/inc/SlideSorterViewShellBase.hxx +++ b/sd/source/ui/inc/SlideSorterViewShellBase.hxx @@ -22,7 +22,6 @@ #include "ImpressViewShellBase.hxx" - namespace sd { /** This class exists to be able to register a factory that creates a diff --git a/sd/source/ui/inc/SpellDialogChildWindow.hxx b/sd/source/ui/inc/SpellDialogChildWindow.hxx index 50cf7e560920..da48fb09917c 100644 --- a/sd/source/ui/inc/SpellDialogChildWindow.hxx +++ b/sd/source/ui/inc/SpellDialogChildWindow.hxx @@ -22,7 +22,6 @@ #include <svx/SpellDialogChildWindow.hxx> - namespace sd { class Outliner; diff --git a/sd/source/ui/inc/TemplateScanner.hxx b/sd/source/ui/inc/TemplateScanner.hxx index 9bdbaae39e8f..e74f33e1f8c7 100644 --- a/sd/source/ui/inc/TemplateScanner.hxx +++ b/sd/source/ui/inc/TemplateScanner.hxx @@ -56,9 +56,6 @@ public: OUString msPath; }; - - - /** Functor that compares two TemplateEntries based on their titles */ class TemplateEntryCompare @@ -71,9 +68,6 @@ private: ::boost::shared_ptr<comphelper::string::NaturalStringSorter> mpStringSorter; }; - - - /** Representation of a template or layout folder. */ class TemplateDir @@ -95,9 +89,6 @@ private: ::boost::scoped_ptr<TemplateEntryCompare> mpEntryCompare; }; - - - /** This class scans the template folders for impress templates. There are two ways to use this class. 1. The old and deprecated way is to call Scan() to scan all templates diff --git a/sd/source/ui/inc/ToolBarManager.hxx b/sd/source/ui/inc/ToolBarManager.hxx index bc10d995824e..2c5cb305ffcb 100644 --- a/sd/source/ui/inc/ToolBarManager.hxx +++ b/sd/source/ui/inc/ToolBarManager.hxx @@ -36,7 +36,6 @@ namespace sd { namespace tools { class EventMultiplexer; } } - namespace sd { class ViewShellBase; diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index b78671d48566..4decd690db24 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -55,7 +55,6 @@ class ViewShell; class Window; class ViewClipboard; - // SdViewRedrawRec struct SdViewRedrawRec { @@ -296,7 +295,6 @@ private: OutlinerMasterViewFilter maMasterViewFilter; }; - SdDrawDocument& View::GetDoc (void) const { return mrDoc; diff --git a/sd/source/ui/inc/ViewClipboard.hxx b/sd/source/ui/inc/ViewClipboard.hxx index 90a69382b9e5..c61cbef0a637 100644 --- a/sd/source/ui/inc/ViewClipboard.hxx +++ b/sd/source/ui/inc/ViewClipboard.hxx @@ -29,7 +29,6 @@ namespace sd { class View; - /** Handle clipboard related tasks for the draw view. */ class ViewClipboard diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index 4d72dd32d82b..f416f10f0f3d 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -446,7 +446,6 @@ public: SdPage* pPage, const sal_Int32 nInsertPosition = -1); - class Implementation; protected: @@ -590,9 +589,6 @@ private: void SetupRulers (void); }; - - - SdrView* ViewShell::GetDrawView (void) const { return static_cast<SdrView*>(mpView); diff --git a/sd/source/ui/inc/ViewShellImplementation.hxx b/sd/source/ui/inc/ViewShellImplementation.hxx index 197b155b603b..5ae4dbc47328 100644 --- a/sd/source/ui/inc/ViewShellImplementation.hxx +++ b/sd/source/ui/inc/ViewShellImplementation.hxx @@ -28,7 +28,6 @@ #include <boost/weak_ptr.hpp> #include <memory> - class SvxIMapDlg; namespace sd { @@ -150,7 +149,6 @@ private: ViewShell& mrViewShell; }; - } // end of namespace sd #endif diff --git a/sd/source/ui/inc/ViewShellManager.hxx b/sd/source/ui/inc/ViewShellManager.hxx index 73419c98b790..ac8bbfb3b2a1 100644 --- a/sd/source/ui/inc/ViewShellManager.hxx +++ b/sd/source/ui/inc/ViewShellManager.hxx @@ -186,8 +186,6 @@ private: void UnlockUpdate (void); }; - - } // end of namespace sd #endif diff --git a/sd/source/ui/inc/ViewTabBar.hxx b/sd/source/ui/inc/ViewTabBar.hxx index a746b1701a07..31dab6f791e4 100644 --- a/sd/source/ui/inc/ViewTabBar.hxx +++ b/sd/source/ui/inc/ViewTabBar.hxx @@ -49,9 +49,6 @@ namespace { > ViewTabBarInterfaceBase; } - - - namespace sd { /** Tab control for switching between views in the center pane. @@ -81,14 +78,12 @@ public: const ::com::sun::star::drawing::framework::ConfigurationChangeEvent& rEvent) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //----- XEventListener ---------------------------------------------------- virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& rEvent) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //----- XTabBar ----------------------------------------------------------- virtual void @@ -116,7 +111,6 @@ public: SAL_CALL getTabBarButtons (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //----- XResource --------------------------------------------------------- virtual ::com::sun::star::uno::Reference< @@ -126,14 +120,11 @@ public: virtual sal_Bool SAL_CALL isAnchorOnly (void) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //----- XUnoTunnel -------------------------------------------------------- virtual sal_Int64 SAL_CALL getSomething (const com::sun::star::uno::Sequence<sal_Int8>& rId) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - /** The returned value is calculated as the difference between the total height of the control and the heigh of its first tab page. This can be considered a hack. diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx index bca37326fafe..a35f4fe1be5b 100644 --- a/sd/source/ui/inc/Window.hxx +++ b/sd/source/ui/inc/Window.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SD_SOURCE_UI_INC_WINDOW_HXX #define INCLUDED_SD_SOURCE_UI_INC_WINDOW_HXX - #include <tools/gen.hxx> #include <vcl/window.hxx> #include <svtools/transfer.hxx> @@ -86,7 +85,6 @@ public: long GetZoomForRect( const Rectangle& rZoomRect ); - void SetMinZoomAutoCalc (bool bAuto); void SetCalcMinZoomByMinSide (bool bMin); diff --git a/sd/source/ui/inc/WindowUpdater.hxx b/sd/source/ui/inc/WindowUpdater.hxx index fd775eee7ffd..aa6c95a48e7d 100644 --- a/sd/source/ui/inc/WindowUpdater.hxx +++ b/sd/source/ui/inc/WindowUpdater.hxx @@ -30,7 +30,6 @@ class Window; class OutputDevice; class SdDrawDocument; - namespace sd { class ViewShell; diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx index 87fea2763d84..9be3815bdbf9 100644 --- a/sd/source/ui/inc/animobjs.hxx +++ b/sd/source/ui/inc/animobjs.hxx @@ -31,7 +31,6 @@ #include <svx/dlgctrl.hxx> #include <sfx2/progress.hxx> - #include <vcl/lstbox.hxx> #include "sdresid.hxx" @@ -45,8 +44,6 @@ namespace sd { class AnimationControllerItem; class View; - - enum BitmapAdjustment { BA_LEFT_UP, @@ -60,8 +57,6 @@ enum BitmapAdjustment BA_RIGHT_DOWN }; - - class SdDisplay : public Control { private: @@ -80,8 +75,6 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; }; - - class AnimationWindow : public SfxDockingWindow { friend class AnimationChildWindow; @@ -129,7 +122,6 @@ private: HelpButton aBtnHelp; - ::Window* pWin; ::std::vector< ::std::pair<BitmapEx*, Time*> > m_FrameList; static const size_t EMPTY_FRAMELIST = ULONG_MAX; @@ -148,7 +140,6 @@ private: ScopeLock maPlayLock; - DECL_LINK( ClickFirstHdl, void * ); DECL_LINK( ClickStopHdl, void * ); DECL_LINK( ClickPlayHdl, void * ); diff --git a/sd/source/ui/inc/annotationmanager.hxx b/sd/source/ui/inc/annotationmanager.hxx index 4527b146f4aa..1b505c0cfdf1 100644 --- a/sd/source/ui/inc/annotationmanager.hxx +++ b/sd/source/ui/inc/annotationmanager.hxx @@ -30,8 +30,6 @@ namespace sd class ViewShellBase; class AnnotationManagerImpl; - - class AnnotationManager { public: diff --git a/sd/source/ui/inc/assclass.hxx b/sd/source/ui/inc/assclass.hxx index 6dc691d49c8e..805e07409657 100644 --- a/sd/source/ui/inc/assclass.hxx +++ b/sd/source/ui/inc/assclass.hxx @@ -66,7 +66,6 @@ public: int GetCurrentPage() const { return mnCurrentPage;} }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/celltempl.hxx b/sd/source/ui/inc/celltempl.hxx index 5f87f53ab792..97a648d7e1ef 100644 --- a/sd/source/ui/inc/celltempl.hxx +++ b/sd/source/ui/inc/celltempl.hxx @@ -43,7 +43,6 @@ public: const SfxItemSet* GetOutputItemSet() const; }; - #endif // INCLUDED_SD_SOURCE_UI_INC_CELLTEMPL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/cfgids.hxx b/sd/source/ui/inc/cfgids.hxx index a2d5550ce810..ec8fa231d441 100644 --- a/sd/source/ui/inc/cfgids.hxx +++ b/sd/source/ui/inc/cfgids.hxx @@ -53,7 +53,6 @@ #define RID_DRAW_GRAF_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 30) #define RID_DRAW_MEDIA_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 31) - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/custsdlg.hxx b/sd/source/ui/inc/custsdlg.hxx index 2b0fa42f165a..1aff1d703939 100644 --- a/sd/source/ui/inc/custsdlg.hxx +++ b/sd/source/ui/inc/custsdlg.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SD_SOURCE_UI_INC_CUSTSDLG_HXX #define INCLUDED_SD_SOURCE_UI_INC_CUSTSDLG_HXX @@ -32,8 +31,6 @@ class SdDrawDocument; class SdCustomShow; class SdCustomShowList; - - class SdCustomShowDlg : public ModalDialog { private: @@ -65,9 +62,6 @@ public: bool IsCustomShow() const; }; - - - class SdDefineCustomShowDlg : public ModalDialog { private: diff --git a/sd/source/ui/inc/diactrl.hxx b/sd/source/ui/inc/diactrl.hxx index f4b83e6b7fa4..3b31d627b0ab 100644 --- a/sd/source/ui/inc/diactrl.hxx +++ b/sd/source/ui/inc/diactrl.hxx @@ -30,7 +30,6 @@ #include <sfx2/tbxctrl.hxx> #include <com/sun/star/frame/XFrame.hpp> - // SdPagesField: class SdPagesField : public SvxMetricField @@ -49,10 +48,8 @@ public: void UpdatePagesField( const SfxUInt16Item* pItem ); }; - // SdTbxCtlDiaPages: - class SdTbxCtlDiaPages : public SfxToolBoxControl { public: @@ -68,6 +65,4 @@ public: #endif // INCLUDED_SD_SOURCE_UI_INC_DIACTRL_HXX - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/dlg_char.hxx b/sd/source/ui/inc/dlg_char.hxx index a6d0eb8ab68b..2bb72ae9d734 100644 --- a/sd/source/ui/inc/dlg_char.hxx +++ b/sd/source/ui/inc/dlg_char.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SD_SOURCE_UI_INC_DLG_CHAR_HXX #define INCLUDED_SD_SOURCE_UI_INC_DLG_CHAR_HXX @@ -26,7 +25,6 @@ class SfxItemSet; class SfxObjectShell; - /** * Character-Tab-Dialog */ diff --git a/sd/source/ui/inc/dlgctrls.hxx b/sd/source/ui/inc/dlgctrls.hxx index c4235df8f721..2d73fd52ee66 100644 --- a/sd/source/ui/inc/dlgctrls.hxx +++ b/sd/source/ui/inc/dlgctrls.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SD_SOURCE_UI_INC_DLGCTRLS_HXX #define INCLUDED_SD_SOURCE_UI_INC_DLGCTRLS_HXX diff --git a/sd/source/ui/inc/dlgfield.hxx b/sd/source/ui/inc/dlgfield.hxx index e0e82fff946b..909370fc5ffd 100644 --- a/sd/source/ui/inc/dlgfield.hxx +++ b/sd/source/ui/inc/dlgfield.hxx @@ -17,11 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SD_SOURCE_UI_INC_DLGFIELD_HXX #define INCLUDED_SD_SOURCE_UI_INC_DLGFIELD_HXX - #include <vcl/lstbox.hxx> #include <vcl/group.hxx> #include <vcl/fixed.hxx> @@ -57,8 +55,6 @@ public: SfxItemSet GetItemSet(); }; - - #endif // INCLUDED_SD_SOURCE_UI_INC_DLGFIELD_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/dlgpage.hxx b/sd/source/ui/inc/dlgpage.hxx index 1878aa3bf362..6fd241b34894 100644 --- a/sd/source/ui/inc/dlgpage.hxx +++ b/sd/source/ui/inc/dlgpage.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SD_SOURCE_UI_INC_DLGPAGE_HXX #define INCLUDED_SD_SOURCE_UI_INC_DLGPAGE_HXX diff --git a/sd/source/ui/inc/dlgsnap.hxx b/sd/source/ui/inc/dlgsnap.hxx index d6464b98e7b0..f16156fb4498 100644 --- a/sd/source/ui/inc/dlgsnap.hxx +++ b/sd/source/ui/inc/dlgsnap.hxx @@ -17,11 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SD_SOURCE_UI_INC_DLGSNAP_HXX #define INCLUDED_SD_SOURCE_UI_INC_DLGSNAP_HXX - #include <vcl/button.hxx> #include <vcl/fixed.hxx> #include <vcl/field.hxx> @@ -69,8 +67,6 @@ public: void SetInputFields(bool bEnableX, bool bEnableY); }; - - #endif // INCLUDED_SD_SOURCE_UI_INC_DLGSNAP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/drawview.hxx b/sd/source/ui/inc/drawview.hxx index 026fa95720aa..4da87a1d97be 100644 --- a/sd/source/ui/inc/drawview.hxx +++ b/sd/source/ui/inc/drawview.hxx @@ -22,7 +22,6 @@ #include "View.hxx" - namespace sd { class DrawDocShell; diff --git a/sd/source/ui/inc/facreg.hxx b/sd/source/ui/inc/facreg.hxx index ba6ae293aefe..2995e99042aa 100644 --- a/sd/source/ui/inc/facreg.hxx +++ b/sd/source/ui/inc/facreg.hxx @@ -171,7 +171,6 @@ css::uno::Sequence<OUString> SAL_CALL PresenterPreviewCache_getSupportedServiceN throw (css::uno::RuntimeException); } } - namespace sd { namespace slidesorter { css::uno::Reference<css::uno::XInterface> SAL_CALL SlideSorterService_createInstance( const css::uno::Reference<css::uno::XComponentContext>& rxContext) diff --git a/sd/source/ui/inc/filedlg.hxx b/sd/source/ui/inc/filedlg.hxx index 4460296003ec..37c60fb93b62 100644 --- a/sd/source/ui/inc/filedlg.hxx +++ b/sd/source/ui/inc/filedlg.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SD_SOURCE_UI_INC_FILEDLG_HXX #define INCLUDED_SD_SOURCE_UI_INC_FILEDLG_HXX @@ -29,7 +28,6 @@ class SdFileDialog_Imp; - /******************************************************************************/ /** diff --git a/sd/source/ui/inc/framework/Configuration.hxx b/sd/source/ui/inc/framework/Configuration.hxx index bba6bbe6b592..457023b633e5 100644 --- a/sd/source/ui/inc/framework/Configuration.hxx +++ b/sd/source/ui/inc/framework/Configuration.hxx @@ -38,9 +38,6 @@ typedef ::cppu::WeakComponentImplHelper2 < } // end of anonymous namespace. - - - namespace sd { namespace framework { /** A configuration describes the resources of an application like panes, @@ -86,7 +83,6 @@ public: virtual void SAL_CALL disposing (void) SAL_OVERRIDE; - // XConfiguration virtual void SAL_CALL addResource ( @@ -112,14 +108,12 @@ public: rxResourceId) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XCloneable virtual ::com::sun::star::uno::Reference<com::sun::star::util::XCloneable> SAL_CALL createClone (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XNamed /** Return a human readable string representation. This is used for @@ -183,7 +177,6 @@ private: throw (::com::sun::star::lang::DisposedException); }; - /** Return whether the two given configurations contain the same resource ids. The order of resource ids is ignored. Empty references are treated like empty configurations. diff --git a/sd/source/ui/inc/framework/ConfigurationController.hxx b/sd/source/ui/inc/framework/ConfigurationController.hxx index 941047e5e6f8..fd09381e6a81 100644 --- a/sd/source/ui/inc/framework/ConfigurationController.hxx +++ b/sd/source/ui/inc/framework/ConfigurationController.hxx @@ -48,10 +48,8 @@ typedef ::cppu::WeakComponentImplHelper2 < } // end of anonymous namespace. - namespace sd { class ViewShellBase; } - namespace sd { namespace framework { /** The configuration controller is responsible for maintaining the current @@ -127,7 +125,6 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XConfigurationControllerBroadcaster virtual void SAL_CALL addConfigurationChangeListener ( @@ -146,7 +143,6 @@ public: const css::drawing::framework::ConfigurationChangeEvent& rEvent) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XConfigurationRequestQueue virtual sal_Bool SAL_CALL hasPendingRequests (void) @@ -157,7 +153,6 @@ public: css::drawing::framework::XConfigurationChangeRequest>& rxRequest) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XResourceFactoryManager virtual void SAL_CALL addResourceFactory( @@ -178,14 +173,12 @@ public: const OUString& sResourceURL) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XInitialization virtual void SAL_CALL initialize( const css::uno::Sequence<css::uno::Any>& rArguments) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - /** Use this class instead of calling lock() and unlock() directly in order to be exception safe. */ diff --git a/sd/source/ui/inc/framework/DrawModule.hxx b/sd/source/ui/inc/framework/DrawModule.hxx index e8e2482f723c..114da1f35d89 100644 --- a/sd/source/ui/inc/framework/DrawModule.hxx +++ b/sd/source/ui/inc/framework/DrawModule.hxx @@ -22,7 +22,6 @@ #include <com/sun/star/frame/XController.hpp> - namespace sd { namespace framework { /** The task of this module is to instantiate all modules that belong to the diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx index 434b6a3ab576..18495a90212c 100644 --- a/sd/source/ui/inc/framework/FrameworkHelper.hxx +++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx @@ -304,7 +304,6 @@ public: cssu::Reference<cssdf::XConfigurationController> GetConfigurationController (void) const { return mxConfigurationController;} - private: typedef ::std::map< ViewShellBase*, @@ -356,7 +355,6 @@ private: void disposing (const css::lang::EventObject& rEventObject); }; - } } // end of namespace sd::framework #endif diff --git a/sd/source/ui/inc/framework/ModuleController.hxx b/sd/source/ui/inc/framework/ModuleController.hxx index 3eb78437c905..37e3a5f14cce 100644 --- a/sd/source/ui/inc/framework/ModuleController.hxx +++ b/sd/source/ui/inc/framework/ModuleController.hxx @@ -41,8 +41,6 @@ typedef ::cppu::WeakComponentImplHelper2 < } // end of anonymous namespace. - - namespace sd { namespace framework { /** The ModuleController has to tasks: @@ -76,13 +74,11 @@ public: virtual void SAL_CALL disposing (void) SAL_OVERRIDE; - // XModuleController virtual void SAL_CALL requestResource(const OUString& rsResourceURL) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XInitialization virtual void SAL_CALL initialize( diff --git a/sd/source/ui/inc/framework/Pane.hxx b/sd/source/ui/inc/framework/Pane.hxx index c0b9221620b3..2d7a061483ec 100644 --- a/sd/source/ui/inc/framework/Pane.hxx +++ b/sd/source/ui/inc/framework/Pane.hxx @@ -102,7 +102,6 @@ public: SAL_CALL getCanvas (void) throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; - //----- XPane2 ------------------------------------------------------------- virtual sal_Bool SAL_CALL isVisible (void) @@ -118,7 +117,6 @@ public: const cssu::Reference<css::accessibility::XAccessible>& rxAccessible) throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; - //----- XResource --------------------------------------------------------- virtual ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> @@ -131,13 +129,11 @@ public: virtual sal_Bool SAL_CALL isAnchorOnly (void) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //----- XUnoTunnel -------------------------------------------------------- virtual sal_Int64 SAL_CALL getSomething (const com::sun::star::uno::Sequence<sal_Int8>& rId) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - protected: ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> mxPaneId; ::Window* mpWindow; diff --git a/sd/source/ui/inc/framework/PresentationFactory.hxx b/sd/source/ui/inc/framework/PresentationFactory.hxx index 38c07876fa30..1c00b5f73995 100644 --- a/sd/source/ui/inc/framework/PresentationFactory.hxx +++ b/sd/source/ui/inc/framework/PresentationFactory.hxx @@ -31,7 +31,6 @@ #include <osl/mutex.hxx> #include <cppuhelper/compbase2.hxx> - #include <boost/scoped_ptr.hpp> #include <boost/shared_ptr.hpp> @@ -44,8 +43,6 @@ typedef ::cppu::WeakComponentImplHelper2 < } // end of anonymous namespace. - - namespace sd { namespace framework { /** This factory creates a marker view whose existence in a configuration @@ -65,7 +62,6 @@ public: virtual void SAL_CALL disposing (void) SAL_OVERRIDE; - // XResourceFactory virtual css::uno::Reference<css::drawing::framework::XResource> @@ -78,14 +74,12 @@ public: const css::uno::Reference<css::drawing::framework::XResource>& xView) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( const css::drawing::framework::ConfigurationChangeEvent& rEvent) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // lang::XEventListener virtual void SAL_CALL disposing ( diff --git a/sd/source/ui/inc/framework/ResourceId.hxx b/sd/source/ui/inc/framework/ResourceId.hxx index 30bccf4c8a59..102a1c2b7fbb 100644 --- a/sd/source/ui/inc/framework/ResourceId.hxx +++ b/sd/source/ui/inc/framework/ResourceId.hxx @@ -35,9 +35,6 @@ typedef ::cppu::WeakImplHelper2 < } // end of anonymous namespace. - - - namespace sd { namespace framework { /** Implementation of the css::drawing::framework::ResourceId diff --git a/sd/source/ui/inc/framework/ViewShellWrapper.hxx b/sd/source/ui/inc/framework/ViewShellWrapper.hxx index 95252e77e5e8..e785952ebb92 100644 --- a/sd/source/ui/inc/framework/ViewShellWrapper.hxx +++ b/sd/source/ui/inc/framework/ViewShellWrapper.hxx @@ -115,7 +115,6 @@ public: com::sun::star::drawing::framework::XResource>& xResource) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XWindowListener virtual void SAL_CALL windowResized( @@ -134,7 +133,6 @@ public: const ::com::sun::star::lang::EventObject& rEvent) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XEventListener virtual void SAL_CALL disposing( diff --git a/sd/source/ui/inc/fuconarc.hxx b/sd/source/ui/inc/fuconarc.hxx index 30208baf1fa7..270e56508d1b 100644 --- a/sd/source/ui/inc/fuconarc.hxx +++ b/sd/source/ui/inc/fuconarc.hxx @@ -24,7 +24,6 @@ namespace sd { - class FuConstructArc : public FuConstruct { diff --git a/sd/source/ui/inc/fuconbez.hxx b/sd/source/ui/inc/fuconbez.hxx index 43aa50e64ee2..449c25ff8bdf 100644 --- a/sd/source/ui/inc/fuconbez.hxx +++ b/sd/source/ui/inc/fuconbez.hxx @@ -29,7 +29,6 @@ namespace sd { class Window; - class FuConstructBezierPolygon : public FuConstruct { diff --git a/sd/source/ui/inc/fudspord.hxx b/sd/source/ui/inc/fudspord.hxx index aaea29645b60..e67218d62c55 100644 --- a/sd/source/ui/inc/fudspord.hxx +++ b/sd/source/ui/inc/fudspord.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SD_SOURCE_UI_INC_FUDSPORD_HXX #define INCLUDED_SD_SOURCE_UI_INC_FUDSPORD_HXX - #include "fupoor.hxx" #include <vcl/pointr.hxx> diff --git a/sd/source/ui/inc/fuhhconv.hxx b/sd/source/ui/inc/fuhhconv.hxx index ee34bd6b4f5d..93a1a21cf945 100644 --- a/sd/source/ui/inc/fuhhconv.hxx +++ b/sd/source/ui/inc/fuhhconv.hxx @@ -26,7 +26,6 @@ namespace sd { class Outliner; - class FuHangulHanjaConversion : public FuPoor { public: @@ -61,7 +60,6 @@ private: #endif // INCLUDED_SD_SOURCE_UI_INC_FUHHCONV_HXX - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/fuinsert.hxx b/sd/source/ui/inc/fuinsert.hxx index 25b7ed329312..1e11d8b833eb 100644 --- a/sd/source/ui/inc/fuinsert.hxx +++ b/sd/source/ui/inc/fuinsert.hxx @@ -44,7 +44,6 @@ private: SfxRequest& rReq); }; - /************************************************************************/ class FuInsertClipboard @@ -65,7 +64,6 @@ private: SfxRequest& rReq); }; - /************************************************************************/ class FuInsertOLE diff --git a/sd/source/ui/inc/fulink.hxx b/sd/source/ui/inc/fulink.hxx index ac127bf4bb2e..9dcea2094c31 100644 --- a/sd/source/ui/inc/fulink.hxx +++ b/sd/source/ui/inc/fulink.hxx @@ -47,5 +47,4 @@ private: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/fuolbull.hxx b/sd/source/ui/inc/fuolbull.hxx index a5b559436af2..0a600cd7284d 100644 --- a/sd/source/ui/inc/fuolbull.hxx +++ b/sd/source/ui/inc/fuolbull.hxx @@ -58,7 +58,6 @@ private: const SfxPoolItem* GetNumBulletItem(SfxItemSet& aNewAttr, sal_uInt32& nNumItemId); }; - } // end of namespace sd #endif diff --git a/sd/source/ui/inc/fuoutl.hxx b/sd/source/ui/inc/fuoutl.hxx index 3f02120d8993..d53b4d2079f3 100644 --- a/sd/source/ui/inc/fuoutl.hxx +++ b/sd/source/ui/inc/fuoutl.hxx @@ -25,7 +25,6 @@ class SdDrawDocument; class SfxRequest; - namespace sd { class OutlineView; diff --git a/sd/source/ui/inc/fuprobjs.hxx b/sd/source/ui/inc/fuprobjs.hxx index b8446fbc89d9..8cecd9e5377d 100644 --- a/sd/source/ui/inc/fuprobjs.hxx +++ b/sd/source/ui/inc/fuprobjs.hxx @@ -31,7 +31,6 @@ class View; class ViewShell; class Window; - class FuPresentationObjects : public FuPoor { diff --git a/sd/source/ui/inc/fusearch.hxx b/sd/source/ui/inc/fusearch.hxx index 63cb35973e55..be7ad1bfceee 100644 --- a/sd/source/ui/inc/fusearch.hxx +++ b/sd/source/ui/inc/fusearch.hxx @@ -61,5 +61,4 @@ private: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/fusel.hxx b/sd/source/ui/inc/fusel.hxx index 1426afe4e7a3..fd59ea6d5ffc 100644 --- a/sd/source/ui/inc/fusel.hxx +++ b/sd/source/ui/inc/fusel.hxx @@ -27,7 +27,6 @@ class SdrHdl; class SdrObject; - namespace sd { class FuSelection diff --git a/sd/source/ui/inc/futhes.hxx b/sd/source/ui/inc/futhes.hxx index ed2b59aafe02..489415f8a35a 100644 --- a/sd/source/ui/inc/futhes.hxx +++ b/sd/source/ui/inc/futhes.hxx @@ -46,5 +46,4 @@ private: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/ins_paste.hxx b/sd/source/ui/inc/ins_paste.hxx index adc8e0efb9e4..87f6054233ad 100644 --- a/sd/source/ui/inc/ins_paste.hxx +++ b/sd/source/ui/inc/ins_paste.hxx @@ -27,7 +27,6 @@ #include <vcl/dialog.hxx> #include "sdresid.hxx" - // SdInsertPasteDlg class SD_DLLPUBLIC SdInsertPasteDlg : public ModalDialog { diff --git a/sd/source/ui/inc/inspagob.hxx b/sd/source/ui/inc/inspagob.hxx index 36ab45d44b12..639ec621b35b 100644 --- a/sd/source/ui/inc/inspagob.hxx +++ b/sd/source/ui/inc/inspagob.hxx @@ -26,8 +26,6 @@ class SdDrawDocument; - - class SdInsertPagesObjsDlg : public ModalDialog { private: @@ -59,7 +57,6 @@ public: bool IsRemoveUnnessesaryMasterPages() const; }; - #endif // INCLUDED_SD_SOURCE_UI_INC_INSPAGOB_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/layeroptionsdlg.hxx b/sd/source/ui/inc/layeroptionsdlg.hxx index 8216c57cbb53..c7d9f92b3012 100644 --- a/sd/source/ui/inc/layeroptionsdlg.hxx +++ b/sd/source/ui/inc/layeroptionsdlg.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SD_SOURCE_UI_INC_LAYEROPTIONSDLG_HXX #define INCLUDED_SD_SOURCE_UI_INC_LAYEROPTIONSDLG_HXX diff --git a/sd/source/ui/inc/morphdlg.hxx b/sd/source/ui/inc/morphdlg.hxx index 1e639eb31fc5..3e057207136d 100644 --- a/sd/source/ui/inc/morphdlg.hxx +++ b/sd/source/ui/inc/morphdlg.hxx @@ -53,10 +53,8 @@ private: void LoadSettings(); }; - #endif - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx index b7a8e85dc831..6aec09ace31b 100644 --- a/sd/source/ui/inc/navigatr.hxx +++ b/sd/source/ui/inc/navigatr.hxx @@ -55,8 +55,6 @@ class Menu; class SdNavigatorControllerItem; class SdPageNameControllerItem; - - class NavDocInfo { public: @@ -80,8 +78,6 @@ private: ::sd::DrawDocShell* mpDocShell; }; - - class SdNavigatorWin : public Window { @@ -117,7 +113,6 @@ protected: virtual void Resize() SAL_OVERRIDE; virtual bool Notify(NotifyEvent& rNEvt) SAL_OVERRIDE; - private: friend class ::sd::NavigatorChildWindow; friend class SdNavigatorControllerItem; @@ -168,9 +163,6 @@ public: void FreshEntry( ); }; - - - /** * ControllerItem for Navigator */ @@ -189,8 +181,6 @@ private: const SdNavigatorWin::UpdateRequestFunctor maUpdateRequest; }; - - /** * ControllerItem for Navigator to show the page in the TreeLB */ diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index 81fc9d538498..61f4dd0d1d56 100644 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx @@ -56,7 +56,6 @@ private: const SdOptionsGeneric& mrParent; - public: SdOptionsItem( const SdOptionsGeneric& rParent, const OUString& rSubTree ); @@ -110,7 +109,6 @@ public: void Store(); - static bool isMetricSystem(); }; diff --git a/sd/source/ui/inc/paragr.hxx b/sd/source/ui/inc/paragr.hxx index 5acae8a6eea5..6ceffa3b0844 100644 --- a/sd/source/ui/inc/paragr.hxx +++ b/sd/source/ui/inc/paragr.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SD_SOURCE_UI_INC_PARAGR_HXX #define INCLUDED_SD_SOURCE_UI_INC_PARAGR_HXX - #include <sfx2/tabdlg.hxx> /** @@ -40,5 +39,4 @@ public: #endif // INCLUDED_SD_SOURCE_UI_INC_PARAGR_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/pgjump.hxx b/sd/source/ui/inc/pgjump.hxx index ae08e88c87ea..b25d38e145ff 100644 --- a/sd/source/ui/inc/pgjump.hxx +++ b/sd/source/ui/inc/pgjump.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SD_SOURCE_UI_INC_PGJUMP_HXX #define INCLUDED_SD_SOURCE_UI_INC_PGJUMP_HXX @@ -30,7 +29,6 @@ enum PageJump PAGE_LAST }; - #endif // INCLUDED_SD_SOURCE_UI_INC_PGJUMP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/present.hxx b/sd/source/ui/inc/present.hxx index a75f2d26aae5..de4bd53d2093 100644 --- a/sd/source/ui/inc/present.hxx +++ b/sd/source/ui/inc/present.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SD_SOURCE_UI_INC_PRESENT_HXX #define INCLUDED_SD_SOURCE_UI_INC_PRESENT_HXX diff --git a/sd/source/ui/inc/prltempl.hxx b/sd/source/ui/inc/prltempl.hxx index 5ae279856249..e903969e8584 100644 --- a/sd/source/ui/inc/prltempl.hxx +++ b/sd/source/ui/inc/prltempl.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SD_SOURCE_UI_INC_PRLTEMPL_HXX #define INCLUDED_SD_SOURCE_UI_INC_PRLTEMPL_HXX @@ -27,7 +26,6 @@ #include "prlayout.hxx" - class SfxObjectShell; class SfxStyleSheetBase; class SfxStyleSheetBasePool; @@ -92,7 +90,6 @@ public: const SfxItemSet* GetOutputItemSet() const; }; - #endif // INCLUDED_SD_SOURCE_UI_INC_PRLTEMPL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/prntopts.hxx b/sd/source/ui/inc/prntopts.hxx index 0b3dc7a12920..62c2922c5579 100644 --- a/sd/source/ui/inc/prntopts.hxx +++ b/sd/source/ui/inc/prntopts.hxx @@ -73,9 +73,6 @@ public: virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; }; - - #endif // INCLUDED_SD_SOURCE_UI_INC_PRNTOPTS_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/sdpopup.hxx b/sd/source/ui/inc/sdpopup.hxx index f2a429e42a90..46a42abc4e86 100644 --- a/sd/source/ui/inc/sdpopup.hxx +++ b/sd/source/ui/inc/sdpopup.hxx @@ -17,11 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SD_SOURCE_UI_INC_SDPOPUP_HXX #define INCLUDED_SD_SOURCE_UI_INC_SDPOPUP_HXX - #include <vcl/menu.hxx> class SvxFieldData; @@ -45,8 +43,6 @@ public: SvxFieldData* GetField(); }; - - #endif // INCLUDED_SD_SOURCE_UI_INC_SDPOPUP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/sdpreslt.hxx b/sd/source/ui/inc/sdpreslt.hxx index d86545feea92..8c94f8f5c434 100644 --- a/sd/source/ui/inc/sdpreslt.hxx +++ b/sd/source/ui/inc/sdpreslt.hxx @@ -33,8 +33,6 @@ namespace sd { class DrawDocShell; } - - class SdPresLayoutDlg : public ModalDialog { diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx index d9aa56e3826c..2554415a88c3 100644 --- a/sd/source/ui/inc/sdxfer.hxx +++ b/sd/source/ui/inc/sdxfer.hxx @@ -25,7 +25,6 @@ #include <sfx2/objsh.hxx> #include <svl/lstner.hxx> - // SdTransferable class SdDrawDocument; class SdrObject; diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx index 6f16ce0bf0b3..425740bb3612 100644 --- a/sd/source/ui/inc/slideshow.hxx +++ b/sd/source/ui/inc/slideshow.hxx @@ -155,7 +155,6 @@ public: !!!! This should only be called by the SdShowWindow !!!!*/ bool pause( bool bPause ); - // settings bool isFullScreen(); // a.k.a. FuSlideShow::IsFullScreen() bool isAlwaysOnTop(); // a.k.a. FuSlideShow::IsAlwaysOnTop(); diff --git a/sd/source/ui/inc/tabtempl.hxx b/sd/source/ui/inc/tabtempl.hxx index c08ee9e952ce..ce2fb8e8e860 100644 --- a/sd/source/ui/inc/tabtempl.hxx +++ b/sd/source/ui/inc/tabtempl.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SD_SOURCE_UI_INC_TABTEMPL_HXX #define INCLUDED_SD_SOURCE_UI_INC_TABTEMPL_HXX @@ -27,7 +26,6 @@ class SdrModel; class SfxObjectShell; class SdrView; - /** * Template-Tab-Dialog */ @@ -78,7 +76,6 @@ public: SdrView* pView); }; - #endif // INCLUDED_SD_SOURCE_UI_INC_TABTEMPL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx b/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx index bc7d7548f126..1155dfd454e1 100644 --- a/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx +++ b/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx @@ -27,7 +27,6 @@ class Window; namespace sd { namespace toolpanel { - class ILayouter { public: @@ -40,8 +39,6 @@ protected: ~ILayouter() {} }; - - /** This interface has to be implemented by windows that want to be layouted by a SubToolPanel or ScrollablePanel object. */ @@ -90,8 +87,6 @@ public: virtual sal_Int32 GetMinimumWidth (void) = 0; }; - - } } // end of namespace ::sd::toolpanel #endif diff --git a/sd/source/ui/inc/taskpane/PanelId.hxx b/sd/source/ui/inc/taskpane/PanelId.hxx index 75401647ea19..b67f1eec1fad 100644 --- a/sd/source/ui/inc/taskpane/PanelId.hxx +++ b/sd/source/ui/inc/taskpane/PanelId.hxx @@ -20,13 +20,9 @@ #ifndef INCLUDED_SD_SOURCE_UI_INC_TASKPANE_PANELID_HXX #define INCLUDED_SD_SOURCE_UI_INC_TASKPANE_PANELID_HXX - - namespace sd { namespace toolpanel { - - /** PanelId List of top level panels that can be shown in the task pane. */ @@ -43,7 +39,6 @@ namespace sd { namespace toolpanel PanelId GetStandardPanelId( const OUString& i_rTaskPanelResourceURL ); - } } // namespace sd::toolpanel #endif // INCLUDED_SD_SOURCE_UI_INC_TASKPANE_PANELID_HXX diff --git a/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx b/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx index b121df4529ea..f72234577ef5 100644 --- a/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx +++ b/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx @@ -30,7 +30,6 @@ //#define USE_SLIDE_SORTER_CACHE_DISPLAY #endif - #ifdef USE_SLIDE_SORTER_CACHE_DISPLAY #include <taskpane/TaskPaneTreeNode.hxx> @@ -42,7 +41,6 @@ class Window; #include "svx/svdpage.hxx" #include "drawdoc.hxx" - namespace sd { namespace toolpanel { class TreeNode; @@ -155,8 +153,6 @@ void SscdSetVisibility (const SdrModel* pModel, sal_Int32 nIndex, bool bVisible) pDisplay->SetPageVisibility(nIndex, bVisible); } - - void SscdSetUpToDate (const SdrPage* pPage, bool bUpToDate) { ::sd::toolpanel::SlideSorterCacheDisplay* pDisplay @@ -166,8 +162,6 @@ void SscdSetUpToDate (const SdrPage* pPage, bool bUpToDate) pDisplay->SetUpToDate((pPage->GetPageNum()-1)/2, bUpToDate); } - - #define SSCD_SET_REQUEST_CLASS(Page,RequestClass) \ SscdSetRequestClass(Page,RequestClass) #define SSCD_SET_STATUS(RequestData,Status) \ @@ -177,7 +171,6 @@ void SscdSetUpToDate (const SdrPage* pPage, bool bUpToDate) #define SSCD_SET_UPTODATE(Page,UpToDate) \ SscdSetUpToDate(Page,UpToDate) - } #else diff --git a/sd/source/ui/inc/taskpane/SubToolPanel.hxx b/sd/source/ui/inc/taskpane/SubToolPanel.hxx index 42bcdffcdfdb..90fc3044b612 100644 --- a/sd/source/ui/inc/taskpane/SubToolPanel.hxx +++ b/sd/source/ui/inc/taskpane/SubToolPanel.hxx @@ -26,7 +26,6 @@ #include <vcl/scrbar.hxx> #include <vector> - class Window; namespace sd { namespace toolpanel { diff --git a/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx b/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx index 4b7de0d788a7..5ab6bc63f8ed 100644 --- a/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx +++ b/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx @@ -28,9 +28,6 @@ namespace sd { namespace toolpanel { class TreeNode; } } - - - namespace sd { namespace toolpanel { /** A simple factory base class defines the interface that is used by @@ -56,8 +53,6 @@ protected: virtual TreeNode* InternalCreateControl( ::Window& i_rParent ) = 0; }; - - /** A simple helper class that realizes a ControlFactory that is able to create root controls, providing the to-be-created control with an additional parameter. */ @@ -80,7 +75,6 @@ private: ArgumentType& mrArgument; }; - } } // end of namespace ::sd::toolpanel #endif diff --git a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx index 4a108758340d..deae2e1899b3 100644 --- a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx +++ b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx @@ -39,7 +39,6 @@ enum TreeNodeStateChangeEventId { EID_SHOWING_STATE_CHANGED }; - /** Base class for all members of the object hierarchy that makes up the tool panel. In the task pane, there are multiple hierarchies of such nodes, with every panel having an own tree. The pane node is the root of the tree, below @@ -177,9 +176,6 @@ private: StateChangeListenerContainer maStateChangeListeners; }; - - - /** Objects of this class are sent to listeners to notify them about state changes of a tree node. */ diff --git a/sd/source/ui/inc/taskpane/TitleBar.hxx b/sd/source/ui/inc/taskpane/TitleBar.hxx index 003cf414b333..fae55b0777fa 100644 --- a/sd/source/ui/inc/taskpane/TitleBar.hxx +++ b/sd/source/ui/inc/taskpane/TitleBar.hxx @@ -30,7 +30,6 @@ class VirtualDevice; namespace sd { namespace toolpanel { - /** The title bar above a control in a sub tool panel. <p>The title bar shows two kinds of indicators: 1) Expansion is diff --git a/sd/source/ui/inc/taskpane/TitledControl.hxx b/sd/source/ui/inc/taskpane/TitledControl.hxx index 33f8d737dcf3..57f6c6998a12 100644 --- a/sd/source/ui/inc/taskpane/TitledControl.hxx +++ b/sd/source/ui/inc/taskpane/TitledControl.hxx @@ -70,7 +70,6 @@ public: virtual ~TitledControl (void); - virtual Size GetPreferredSize (void); virtual sal_Int32 GetPreferredWidth (sal_Int32 nHeight); virtual sal_Int32 GetPreferredHeight (sal_Int32 nWidth); @@ -140,9 +139,6 @@ private: DECL_LINK(WindowEventListener, VclSimpleEvent*); }; - - - /** This standard implementation of the ClickHandler expands, or toggles the expansion state, of the control, whose title was clicked. */ diff --git a/sd/source/ui/inc/tbx_ww.hxx b/sd/source/ui/inc/tbx_ww.hxx index e269491edbf4..fb19bb3d6a69 100644 --- a/sd/source/ui/inc/tbx_ww.hxx +++ b/sd/source/ui/inc/tbx_ww.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SD_SOURCE_UI_INC_TBX_WW_HXX #define INCLUDED_SD_SOURCE_UI_INC_TBX_WW_HXX diff --git a/sd/source/ui/inc/tmplctrl.hxx b/sd/source/ui/inc/tmplctrl.hxx index 559ffc7cf228..83696a549ecb 100644 --- a/sd/source/ui/inc/tmplctrl.hxx +++ b/sd/source/ui/inc/tmplctrl.hxx @@ -39,7 +39,6 @@ private: OUString msTemplate; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/tools/AsynchronousCall.hxx b/sd/source/ui/inc/tools/AsynchronousCall.hxx index 69a37f3196ec..6aac74f50986 100644 --- a/sd/source/ui/inc/tools/AsynchronousCall.hxx +++ b/sd/source/ui/inc/tools/AsynchronousCall.hxx @@ -26,7 +26,6 @@ namespace sd { namespace tools { - /** Store a function object and execute it asynchronous. The features of this class are: @@ -78,7 +77,6 @@ private: DECL_LINK(TimerCallback,Timer*); }; - } } // end of namespace ::sd::tools #endif diff --git a/sd/source/ui/inc/tools/PropertySet.hxx b/sd/source/ui/inc/tools/PropertySet.hxx index a8c87d158fd1..e4a97978073d 100644 --- a/sd/source/ui/inc/tools/PropertySet.hxx +++ b/sd/source/ui/inc/tools/PropertySet.hxx @@ -34,7 +34,6 @@ namespace { > PropertySetInterfaceBase; } - /** A very simple implementation of the XPropertySet interface. It does not support constrained properties and thus does not support vetoable listeners. It does not support the optional property set info. diff --git a/sd/source/ui/inc/tools/SlotStateListener.hxx b/sd/source/ui/inc/tools/SlotStateListener.hxx index ccf7a3972571..2e148b485dbe 100644 --- a/sd/source/ui/inc/tools/SlotStateListener.hxx +++ b/sd/source/ui/inc/tools/SlotStateListener.hxx @@ -32,12 +32,10 @@ namespace sd { namespace tools { - typedef cppu::WeakComponentImplHelper1< ::com::sun::star::frame::XStatusListener > SlotStateListenerInterfaceBase; - /** Listen for state changes of slots. This class has been created in order to be informed when the support for vertical writing changes but it can be used to relay state changes of other slots as well. diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index 4839b2090987..9b2f241b4970 100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SD_SOURCE_UI_INC_TPACTION_HXX #define INCLUDED_SD_SOURCE_UI_INC_TPACTION_HXX @@ -80,8 +79,6 @@ private: OUString aLastFile; ::std::vector< long > aVerbVector; - - DECL_LINK( ClickSearchHdl, void * ); DECL_LINK( ClickActionHdl, void * ); DECL_LINK( SelectTreeHdl, void * ); diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx index ea787eff7c88..632c0c9bf312 100644 --- a/sd/source/ui/inc/tpoption.hxx +++ b/sd/source/ui/inc/tpoption.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SD_SOURCE_UI_INC_TPOPTION_HXX #define INCLUDED_SD_SOURCE_UI_INC_TPOPTION_HXX - #include <vcl/lstbox.hxx> #include <vcl/group.hxx> #include <vcl/fixed.hxx> @@ -56,7 +55,6 @@ private: CheckBox* m_pCbxHandlesBezier; CheckBox* m_pCbxMoveOutline; - public: SdTpOptionsContents( Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SdTpOptionsContents(); @@ -157,7 +155,6 @@ public: }; - #endif // INCLUDED_SD_SOURCE_UI_INC_TPOPTION_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/undoback.hxx b/sd/source/ui/inc/undoback.hxx index 0efaf156d148..360f7f50674c 100644 --- a/sd/source/ui/inc/undoback.hxx +++ b/sd/source/ui/inc/undoback.hxx @@ -26,7 +26,6 @@ class SdDrawDocument; class SdPage; class SfxItemSet; - // SdBackgroundObjUndoAction class SdBackgroundObjUndoAction : public SdUndoAction { diff --git a/sd/source/ui/inc/undopage.hxx b/sd/source/ui/inc/undopage.hxx index 1e3fd64e0905..f27f5e561a0a 100644 --- a/sd/source/ui/inc/undopage.hxx +++ b/sd/source/ui/inc/undopage.hxx @@ -87,7 +87,6 @@ public: mnOldPaperBin (nOPaperBin), mbOldFullSize (bOFullSize), - maNewSize (rNewSz), mnNewLeft (nNewLft), mnNewRight (nNewRgt), @@ -163,8 +162,6 @@ public: virtual void Redo() SAL_OVERRIDE; }; - - #endif // INCLUDED_SD_SOURCE_UI_INC_UNDOPAGE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/unmodpg.hxx b/sd/source/ui/inc/unmodpg.hxx index 180e99079db1..71df7f16e5f7 100644 --- a/sd/source/ui/inc/unmodpg.hxx +++ b/sd/source/ui/inc/unmodpg.hxx @@ -57,7 +57,6 @@ public: virtual OUString GetComment() const SAL_OVERRIDE; }; - class RenameLayoutTemplateUndoAction : public SdUndoAction { public: diff --git a/sd/source/ui/inc/unoaprms.hxx b/sd/source/ui/inc/unoaprms.hxx index 0c1526d34519..ee53ca82e434 100644 --- a/sd/source/ui/inc/unoaprms.hxx +++ b/sd/source/ui/inc/unoaprms.hxx @@ -27,7 +27,6 @@ #include <svx/svdopath.hxx> #include <tools/color.hxx> - class SdDrawDocument; class SdrObject; diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx index d6ba9c398d73..f9fafdd89e99 100644 --- a/sd/source/ui/inc/unomodel.hxx +++ b/sd/source/ui/inc/unomodel.hxx @@ -352,5 +352,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/unoprnms.hxx b/sd/source/ui/inc/unoprnms.hxx index 61d5bc4fd2e6..cb20a4af2882 100644 --- a/sd/source/ui/inc/unoprnms.hxx +++ b/sd/source/ui/inc/unoprnms.hxx @@ -90,5 +90,4 @@ #define UNO_NAME_STYLE_FAMILY "Family" #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/vectdlg.hxx b/sd/source/ui/inc/vectdlg.hxx index 4f0e3e745957..24e4872d8653 100644 --- a/sd/source/ui/inc/vectdlg.hxx +++ b/sd/source/ui/inc/vectdlg.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SD_SOURCE_UI_INC_VECTDLG_HXX #define INCLUDED_SD_SOURCE_UI_INC_VECTDLG_HXX diff --git a/sd/source/ui/inc/zoomlist.hxx b/sd/source/ui/inc/zoomlist.hxx index db8055ab5853..fdd361aa0a77 100644 --- a/sd/source/ui/inc/zoomlist.hxx +++ b/sd/source/ui/inc/zoomlist.hxx @@ -51,5 +51,4 @@ private: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.cxx b/sd/source/ui/presenter/CanvasUpdateRequester.cxx index b736adc4148e..f460f2bdc493 100644 --- a/sd/source/ui/presenter/CanvasUpdateRequester.cxx +++ b/sd/source/ui/presenter/CanvasUpdateRequester.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "CanvasUpdateRequester.hxx" #include <vcl/svapp.hxx> #include <com/sun/star/lang/XComponent.hpp> @@ -35,9 +34,6 @@ public: void operator() (CanvasUpdateRequester* pObject) { delete pObject; } }; - - - //===== CanvasUpdateRequester ================================================= CanvasUpdateRequester::RequesterMap CanvasUpdateRequester::maRequesterMap; @@ -59,9 +55,6 @@ CanvasUpdateRequester::RequesterMap CanvasUpdateRequester::maRequesterMap; return pRequester; } - - - CanvasUpdateRequester::CanvasUpdateRequester ( const Reference<rendering::XSpriteCanvas>& rxCanvas) : mxCanvas(rxCanvas), @@ -75,18 +68,12 @@ CanvasUpdateRequester::CanvasUpdateRequester ( } } - - - CanvasUpdateRequester::~CanvasUpdateRequester (void) { if (mnUserEventId != 0) Application::RemoveUserEvent(mnUserEventId); } - - - void CanvasUpdateRequester::RequestUpdate (const bool bUpdateAll) { if (mnUserEventId == 0) @@ -100,8 +87,6 @@ void CanvasUpdateRequester::RequestUpdate (const bool bUpdateAll) } } - - IMPL_LINK_NOARG(CanvasUpdateRequester, Callback) { mnUserEventId = 0; @@ -113,7 +98,6 @@ IMPL_LINK_NOARG(CanvasUpdateRequester, Callback) return 0; } - } } // end of namespace ::sd::presenter /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.hxx b/sd/source/ui/presenter/CanvasUpdateRequester.hxx index 78bfe2bbfa5a..4143f4e4e9c2 100644 --- a/sd/source/ui/presenter/CanvasUpdateRequester.hxx +++ b/sd/source/ui/presenter/CanvasUpdateRequester.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SD_SOURCE_UI_PRESENTER_CANVASUPDATEREQUESTER_HXX #define INCLUDED_SD_SOURCE_UI_PRESENTER_CANVASUPDATEREQUESTER_HXX - #include <com/sun/star/rendering/XSpriteCanvas.hpp> #include <boost/noncopyable.hpp> #include <boost/shared_ptr.hpp> diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx index e5184930a7f1..5ead6b9390f2 100644 --- a/sd/source/ui/presenter/PresenterCanvas.cxx +++ b/sd/source/ui/presenter/PresenterCanvas.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "PresenterCanvas.hxx" #include "facreg.hxx" @@ -49,17 +48,11 @@ Reference<XInterface> SAL_CALL PresenterCanvas_createInstance ( return Reference<XInterface>(static_cast<XWeak*>(new PresenterCanvas())); } - - - OUString PresenterCanvas_getImplementationName (void) throw(RuntimeException) { return OUString("com.sun.star.comp.Draw.PresenterCanvasFactory"); } - - - Sequence<OUString> SAL_CALL PresenterCanvas_getSupportedServiceNames (void) throw (RuntimeException) { @@ -67,9 +60,6 @@ Sequence<OUString> SAL_CALL PresenterCanvas_getSupportedServiceNames (void) return Sequence<OUString>(&sServiceName, 1); } - - - //===== PresenterCustomSprite ================================================= /** Wrapper around a sprite that is displayed on a PresenterCanvas. @@ -119,7 +109,6 @@ public: virtual void SAL_CALL hide (void) throw (RuntimeException, std::exception) SAL_OVERRIDE; - // XCustomSprite virtual Reference<rendering::XCanvas> SAL_CALL getContentCanvas (void) @@ -136,12 +125,8 @@ private: throw (css::lang::DisposedException); }; - - - //===== PresenterCanvas ======================================================= - PresenterCanvas::PresenterCanvas (void) : PresenterCanvasInterfaceBase(m_aMutex), mxUpdateCanvas(), @@ -155,9 +140,6 @@ PresenterCanvas::PresenterCanvas (void) { } - - - PresenterCanvas::PresenterCanvas ( const Reference<rendering::XSpriteCanvas>& rxUpdateCanvas, const Reference<awt::XWindow>& rxUpdateWindow, @@ -182,16 +164,10 @@ PresenterCanvas::PresenterCanvas ( mpUpdateRequester = CanvasUpdateRequester::Instance(mxUpdateCanvas); } - - - PresenterCanvas::~PresenterCanvas (void) { } - - - void SAL_CALL PresenterCanvas::disposing (void) throw (css::uno::RuntimeException) { @@ -199,9 +175,6 @@ void SAL_CALL PresenterCanvas::disposing (void) mxWindow->removeWindowListener(this); } - - - //----- XInitialization ------------------------------------------------------- void SAL_CALL PresenterCanvas::initialize ( @@ -260,9 +233,6 @@ void SAL_CALL PresenterCanvas::initialize ( } } - - - //----- XCanvas --------------------------------------------------------------- void SAL_CALL PresenterCanvas::clear (void) @@ -273,9 +243,6 @@ void SAL_CALL PresenterCanvas::clear (void) // would clear the whole shared canvas. } - - - void SAL_CALL PresenterCanvas::drawPoint ( const css::geometry::RealPoint2D& aPoint, const css::rendering::ViewState& aViewState, @@ -286,9 +253,6 @@ void SAL_CALL PresenterCanvas::drawPoint ( mxSharedCanvas->drawPoint(aPoint,MergeViewState(aViewState),aRenderState); } - - - void SAL_CALL PresenterCanvas::drawLine ( const css::geometry::RealPoint2D& aStartPoint, const css::geometry::RealPoint2D& aEndPoint, @@ -300,9 +264,6 @@ void SAL_CALL PresenterCanvas::drawLine ( mxSharedCanvas->drawLine(aStartPoint,aEndPoint,MergeViewState(aViewState),aRenderState); } - - - void SAL_CALL PresenterCanvas::drawBezier ( const css::geometry::RealBezierSegment2D& aBezierSegment, const css::geometry::RealPoint2D& aEndPoint, @@ -314,9 +275,6 @@ void SAL_CALL PresenterCanvas::drawBezier ( mxSharedCanvas->drawBezier(aBezierSegment,aEndPoint,MergeViewState(aViewState),aRenderState); } - - - css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL PresenterCanvas::drawPolyPolygon ( const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon, const css::rendering::ViewState& aViewState, @@ -328,9 +286,6 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL PresenterCanvas:: xPolyPolygon, MergeViewState(aViewState), aRenderState); } - - - css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL PresenterCanvas::strokePolyPolygon ( const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon, const css::rendering::ViewState& aViewState, @@ -343,9 +298,6 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL PresenterCanvas:: xPolyPolygon, MergeViewState(aViewState), aRenderState, aStrokeAttributes); } - - - css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL PresenterCanvas::strokeTexturedPolyPolygon ( const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon, @@ -362,9 +314,6 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL xPolyPolygon, MergeViewState(aViewState), aRenderState, aTextures, aStrokeAttributes); } - - - css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL PresenterCanvas::strokeTextureMappedPolyPolygon( const css::uno::Reference<css::rendering::XPolyPolygon2D >& xPolyPolygon, @@ -387,9 +336,6 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL aStrokeAttributes); } - - - css::uno::Reference<css::rendering::XPolyPolygon2D> SAL_CALL PresenterCanvas::queryStrokeShapes( const css::uno::Reference<css::rendering::XPolyPolygon2D>& xPolyPolygon, @@ -403,9 +349,6 @@ css::uno::Reference<css::rendering::XPolyPolygon2D> SAL_CALL xPolyPolygon, MergeViewState(aViewState), aRenderState, aStrokeAttributes); } - - - css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL PresenterCanvas::fillPolyPolygon( const css::uno::Reference<css::rendering::XPolyPolygon2D>& xPolyPolygon, @@ -419,9 +362,6 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL xPolyPolygon, MergeViewState(aViewState), aRenderState); } - - - css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL PresenterCanvas::fillTexturedPolyPolygon( const css::uno::Reference<css::rendering::XPolyPolygon2D>& xPolyPolygon, @@ -437,9 +377,6 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL xPolyPolygon, MergeViewState(aViewState), aRenderState, xTextures); } - - - css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL PresenterCanvas::fillTextureMappedPolyPolygon( const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon, @@ -456,9 +393,6 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL xPolyPolygon, MergeViewState(aViewState), aRenderState, xTextures, xMapping); } - - - css::uno::Reference<css::rendering::XCanvasFont> SAL_CALL PresenterCanvas::createFont( const css::rendering::FontRequest& aFontRequest, @@ -472,9 +406,6 @@ css::uno::Reference<css::rendering::XCanvasFont> SAL_CALL aFontRequest, aExtraFontProperties, aFontMatrix); } - - - css::uno::Sequence<css::rendering::FontInfo> SAL_CALL PresenterCanvas::queryAvailableFonts( const css::rendering::FontInfo& aFilter, @@ -485,9 +416,6 @@ css::uno::Sequence<css::rendering::FontInfo> SAL_CALL return mxSharedCanvas->queryAvailableFonts(aFilter, aFontProperties); } - - - css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL PresenterCanvas::drawText( const css::rendering::StringContext& aText, @@ -502,9 +430,6 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL aText, xFont, MergeViewState(aViewState), aRenderState, nTextDirection); } - - - css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL PresenterCanvas::drawTextLayout( const css::uno::Reference< css::rendering::XTextLayout >& xLayoutetText, @@ -517,9 +442,6 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL xLayoutetText, MergeViewState(aViewState), aRenderState); } - - - css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL PresenterCanvas::drawBitmap( const css::uno::Reference< css::rendering::XBitmap >& xBitmap, @@ -534,9 +456,6 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL xBitmap, MergeViewState(aViewState), aRenderState); } - - - css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL PresenterCanvas::drawBitmapModulated( const css::uno::Reference< css::rendering::XBitmap>& xBitmap, @@ -551,9 +470,6 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL xBitmap, MergeViewState(aViewState), aRenderState); } - - - css::uno::Reference<css::rendering::XGraphicDevice> SAL_CALL PresenterCanvas::getDevice (void) throw (css::uno::RuntimeException, std::exception) @@ -562,9 +478,6 @@ css::uno::Reference<css::rendering::XGraphicDevice> SAL_CALL return mxSharedCanvas->getDevice(); } - - - //----- XSpriteCanvas --------------------------------------------------------- Reference<rendering::XAnimatedSprite> SAL_CALL @@ -581,9 +494,6 @@ Reference<rendering::XAnimatedSprite> SAL_CALL return NULL; } - - - Reference<rendering::XAnimatedSprite> SAL_CALL PresenterCanvas::createSpriteFromBitmaps ( const css::uno::Sequence< @@ -602,9 +512,6 @@ Reference<rendering::XAnimatedSprite> SAL_CALL return NULL; } - - - Reference<rendering::XCustomSprite> SAL_CALL PresenterCanvas::createCustomSprite ( const css::geometry::RealSize2D& rSpriteSize) @@ -629,9 +536,6 @@ Reference<rendering::XCustomSprite> SAL_CALL return NULL; } - - - Reference<rendering::XSprite> SAL_CALL PresenterCanvas::createClonedSprite ( const css::uno::Reference< css::rendering::XSprite >& rxOriginal) @@ -647,9 +551,6 @@ Reference<rendering::XSprite> SAL_CALL return NULL; } - - - sal_Bool SAL_CALL PresenterCanvas::updateScreen (sal_Bool bUpdateAll) throw (css::uno::RuntimeException, std::exception) { @@ -667,9 +568,6 @@ sal_Bool SAL_CALL PresenterCanvas::updateScreen (sal_Bool bUpdateAll) } } - - - //----- XEventListener -------------------------------------------------------- void SAL_CALL PresenterCanvas::disposing (const css::lang::EventObject& rEvent) @@ -680,9 +578,6 @@ void SAL_CALL PresenterCanvas::disposing (const css::lang::EventObject& rEvent) mxWindow = NULL; } - - - //----- XWindowListener ------------------------------------------------------- void SAL_CALL PresenterCanvas::windowResized (const css::awt::WindowEvent& rEvent) @@ -693,9 +588,6 @@ void SAL_CALL PresenterCanvas::windowResized (const css::awt::WindowEvent& rEven mbOffsetUpdatePending = true; } - - - void SAL_CALL PresenterCanvas::windowMoved (const css::awt::WindowEvent& rEvent) throw (css::uno::RuntimeException, std::exception) { @@ -704,9 +596,6 @@ void SAL_CALL PresenterCanvas::windowMoved (const css::awt::WindowEvent& rEvent) mbOffsetUpdatePending = true; } - - - void SAL_CALL PresenterCanvas::windowShown (const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException, std::exception) { @@ -715,9 +604,6 @@ void SAL_CALL PresenterCanvas::windowShown (const css::lang::EventObject& rEvent mbOffsetUpdatePending = true; } - - - void SAL_CALL PresenterCanvas::windowHidden (const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException, std::exception) { @@ -725,9 +611,6 @@ void SAL_CALL PresenterCanvas::windowHidden (const css::lang::EventObject& rEven ThrowIfDisposed(); } - - - //----- XBitmap --------------------------------------------------------------- geometry::IntegerSize2D SAL_CALL PresenterCanvas::getSize (void) @@ -744,9 +627,6 @@ geometry::IntegerSize2D SAL_CALL PresenterCanvas::getSize (void) return geometry::IntegerSize2D(0,0); } - - - sal_Bool SAL_CALL PresenterCanvas::hasAlpha (void) throw (RuntimeException, std::exception) { @@ -757,9 +637,6 @@ sal_Bool SAL_CALL PresenterCanvas::hasAlpha (void) return sal_False; } - - - Reference<rendering::XBitmap> SAL_CALL PresenterCanvas::getScaledBitmap( const css::geometry::RealSize2D& rNewSize, sal_Bool bFast) @@ -777,11 +654,6 @@ Reference<rendering::XBitmap> SAL_CALL PresenterCanvas::getScaledBitmap( return NULL; } - - - - - rendering::ViewState PresenterCanvas::MergeViewState ( const rendering::ViewState& rViewState) { @@ -791,9 +663,6 @@ rendering::ViewState PresenterCanvas::MergeViewState ( return MergeViewState(rViewState, maOffset); } - - - css::rendering::ViewState PresenterCanvas::MergeViewState ( const css::rendering::ViewState& rViewState, const css::awt::Point& rOffset) @@ -849,9 +718,6 @@ css::rendering::ViewState PresenterCanvas::MergeViewState ( return aViewState; } - - - awt::Point PresenterCanvas::GetOffset (const Reference<awt::XWindow>& rxBaseWindow) { mbOffsetUpdatePending = false; @@ -872,9 +738,6 @@ awt::Point PresenterCanvas::GetOffset (const Reference<awt::XWindow>& rxBaseWind return awt::Point(0, 0); } - - - ::basegfx::B2DRectangle PresenterCanvas::GetClipRectangle ( const css::geometry::AffineMatrix2D& rViewTransform, const awt::Point& rOffset) @@ -933,8 +796,6 @@ awt::Point PresenterCanvas::GetOffset (const Reference<awt::XWindow>& rxBaseWind return aWindowRectangle; } - - Reference<rendering::XPolyPolygon2D> PresenterCanvas::UpdateSpriteClip ( const Reference<rendering::XPolyPolygon2D>& rxOriginalClip, const geometry::RealPoint2D& rLocation, @@ -996,9 +857,6 @@ Reference<rendering::XPolyPolygon2D> PresenterCanvas::UpdateSpriteClip ( return xPolygon; } - - - void PresenterCanvas::ThrowIfDisposed (void) throw (css::lang::DisposedException) { @@ -1009,12 +867,8 @@ void PresenterCanvas::ThrowIfDisposed (void) } } - - - //===== PresenterCustomSprite ================================================= - PresenterCustomSprite::PresenterCustomSprite ( const rtl::Reference<PresenterCanvas>& rpCanvas, const Reference<rendering::XCustomSprite>& rxSprite, @@ -1029,16 +883,10 @@ PresenterCustomSprite::PresenterCustomSprite ( { } - - - PresenterCustomSprite::~PresenterCustomSprite (void) { } - - - void SAL_CALL PresenterCustomSprite::disposing (void) throw (RuntimeException) { @@ -1049,9 +897,6 @@ void SAL_CALL PresenterCustomSprite::disposing (void) mpCanvas = rtl::Reference<PresenterCanvas>(); } - - - //----- XSprite --------------------------------------------------------------- void SAL_CALL PresenterCustomSprite::setAlpha (const double nAlpha) @@ -1061,9 +906,6 @@ void SAL_CALL PresenterCustomSprite::setAlpha (const double nAlpha) mxSprite->setAlpha(nAlpha); } - - - void SAL_CALL PresenterCustomSprite::move ( const geometry::RealPoint2D& rNewPos, const rendering::ViewState& rViewState, @@ -1083,9 +925,6 @@ void SAL_CALL PresenterCustomSprite::move ( clip(NULL); } - - - void SAL_CALL PresenterCustomSprite::transform (const geometry::AffineMatrix2D& rTransformation) throw (lang::IllegalArgumentException,RuntimeException, std::exception) { @@ -1093,9 +932,6 @@ void SAL_CALL PresenterCustomSprite::transform (const geometry::AffineMatrix2D& mxSprite->transform(rTransformation); } - - - void SAL_CALL PresenterCustomSprite::clip (const Reference<rendering::XPolyPolygon2D>& rxClip) throw (RuntimeException, std::exception) { @@ -1106,9 +942,6 @@ void SAL_CALL PresenterCustomSprite::clip (const Reference<rendering::XPolyPolyg mxSprite->clip(mpCanvas->UpdateSpriteClip(rxClip, maPosition, maSpriteSize)); } - - - void SAL_CALL PresenterCustomSprite::setPriority (const double nPriority) throw (RuntimeException, std::exception) { @@ -1116,8 +949,6 @@ void SAL_CALL PresenterCustomSprite::setPriority (const double nPriority) mxSprite->setPriority(nPriority); } - - void SAL_CALL PresenterCustomSprite::show (void) throw (RuntimeException, std::exception) { @@ -1125,9 +956,6 @@ void SAL_CALL PresenterCustomSprite::show (void) mxSprite->show(); } - - - void SAL_CALL PresenterCustomSprite::hide (void) throw (RuntimeException, std::exception) { @@ -1135,9 +963,6 @@ void SAL_CALL PresenterCustomSprite::hide (void) mxSprite->hide(); } - - - //----- XCustomSprite --------------------------------------------------------- Reference<rendering::XCanvas> PresenterCustomSprite::getContentCanvas (void) @@ -1147,11 +972,6 @@ Reference<rendering::XCanvas> PresenterCustomSprite::getContentCanvas (void) return mxSprite->getContentCanvas(); } - - - - - void PresenterCustomSprite::ThrowIfDisposed (void) throw (css::lang::DisposedException) { @@ -1162,9 +982,6 @@ void PresenterCustomSprite::ThrowIfDisposed (void) } } - - - } } // end of namespace ::sd::presenter /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/presenter/PresenterCanvas.hxx b/sd/source/ui/presenter/PresenterCanvas.hxx index c45a8b1cd623..80dabd43d1de 100644 --- a/sd/source/ui/presenter/PresenterCanvas.hxx +++ b/sd/source/ui/presenter/PresenterCanvas.hxx @@ -141,14 +141,12 @@ public: const css::geometry::RealPoint2D& rLocation, const css::geometry::RealSize2D& rSize); - // XInitialization virtual void SAL_CALL initialize ( const css::uno::Sequence<css::uno::Any>& rArguments) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XCanvas virtual void SAL_CALL clear (void) @@ -299,7 +297,6 @@ public: getDevice (void) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XSpriteCanvas css::uno::Reference< css::rendering::XAnimatedSprite > SAL_CALL @@ -329,13 +326,11 @@ public: sal_Bool SAL_CALL updateScreen (sal_Bool bUpdateAll) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XWindowListener virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) @@ -350,7 +345,6 @@ public: virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XBitmap virtual css::geometry::IntegerSize2D SAL_CALL getSize (void) @@ -410,8 +404,6 @@ private: throw (css::lang::DisposedException); }; - - } } // end of namespace ::sd::presenter #endif diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx index c17cc86d22f8..bef771fa2847 100644 --- a/sd/source/ui/presenter/PresenterHelper.cxx +++ b/sd/source/ui/presenter/PresenterHelper.cxx @@ -50,18 +50,12 @@ Reference<XInterface> SAL_CALL PresenterHelperService_createInstance ( return Reference<XInterface>(static_cast<XWeak*>(new PresenterHelper(rxContext))); } - - - OUString PresenterHelperService_getImplementationName (void) throw(RuntimeException) { return OUString("com.sun.star.comp.Draw.PresenterHelper"); } - - - Sequence<OUString> SAL_CALL PresenterHelperService_getSupportedServiceNames (void) throw (RuntimeException) { @@ -69,9 +63,6 @@ Sequence<OUString> SAL_CALL PresenterHelperService_getSupportedServiceNames (voi return Sequence<OUString>(&sServiceName, 1); } - - - //===== PresenterHelper ======================================================= PresenterHelper::PresenterHelper ( @@ -81,15 +72,10 @@ PresenterHelper::PresenterHelper ( { } - - PresenterHelper::~PresenterHelper (void) { } - - - //----- XInitialize ----------------------------------------------------------- void SAL_CALL PresenterHelper::initialize (const Sequence<Any>& rArguments) @@ -98,9 +84,6 @@ void SAL_CALL PresenterHelper::initialize (const Sequence<Any>& rArguments) (void)rArguments; } - - - //----- XPaneHelper ---------------------------------------------------- Reference<awt::XWindow> SAL_CALL PresenterHelper::createWindow ( @@ -151,9 +134,6 @@ Reference<awt::XWindow> SAL_CALL PresenterHelper::createWindow ( return xWindow; } - - - Reference<rendering::XCanvas> SAL_CALL PresenterHelper::createSharedCanvas ( const Reference<rendering::XSpriteCanvas>& rxUpdateCanvas, const Reference<awt::XWindow>& rxUpdateWindow, @@ -180,9 +160,6 @@ Reference<rendering::XCanvas> SAL_CALL PresenterHelper::createSharedCanvas ( rxWindow); } - - - Reference<rendering::XCanvas> SAL_CALL PresenterHelper::createCanvas ( const Reference<awt::XWindow>& rxWindow, sal_Int16 nRequestedCanvasFeatures, @@ -219,9 +196,6 @@ Reference<rendering::XCanvas> SAL_CALL PresenterHelper::createCanvas ( throw RuntimeException(); } - - - void SAL_CALL PresenterHelper::toTop ( const Reference<awt::XWindow>& rxWindow) throw (css::uno::RuntimeException, std::exception) @@ -234,8 +208,6 @@ void SAL_CALL PresenterHelper::toTop ( } } - - namespace { struct IdMapEntry { @@ -464,10 +436,6 @@ Reference<rendering::XBitmap> SAL_CALL PresenterHelper::loadBitmap ( return NULL; } - - - - void SAL_CALL PresenterHelper::captureMouse ( const Reference<awt::XWindow>& rxWindow) throw (RuntimeException, std::exception) @@ -482,9 +450,6 @@ void SAL_CALL PresenterHelper::captureMouse ( } } - - - void SAL_CALL PresenterHelper::releaseMouse (const Reference<awt::XWindow>& rxWindow) throw (RuntimeException, std::exception) { @@ -498,9 +463,6 @@ void SAL_CALL PresenterHelper::releaseMouse (const Reference<awt::XWindow>& rxWi } } - - - awt::Rectangle PresenterHelper::getWindowExtentsRelative ( const Reference<awt::XWindow>& rxChildWindow, const Reference<awt::XWindow>& rxParentWindow) @@ -517,8 +479,6 @@ awt::Rectangle PresenterHelper::getWindowExtentsRelative ( return awt::Rectangle(); } - - } } // end of namespace ::sd::presenter /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/presenter/PresenterHelper.hxx b/sd/source/ui/presenter/PresenterHelper.hxx index bbacc31d91b9..44bc3fc7b555 100644 --- a/sd/source/ui/presenter/PresenterHelper.hxx +++ b/sd/source/ui/presenter/PresenterHelper.hxx @@ -53,7 +53,6 @@ public: virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) throw(css::uno::Exception,css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XPresenterHelper virtual css::uno::Reference<css::awt::XWindow> SAL_CALL createWindow ( diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx index 998cbb1a12a4..f88d2a59eef0 100644 --- a/sd/source/ui/presenter/PresenterPreviewCache.cxx +++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "PresenterPreviewCache.hxx" #include "facreg.hxx" @@ -33,7 +32,6 @@ using namespace ::sd::slidesorter::cache; namespace sd { namespace presenter { - class PresenterPreviewCache::PresenterCacheContext : public CacheContext { public: @@ -72,9 +70,6 @@ private: void CallListeners (const sal_Int32 nSlideIndex); }; - - - //===== Service =============================================================== Reference<XInterface> SAL_CALL PresenterPreviewCache_createInstance ( @@ -83,17 +78,11 @@ Reference<XInterface> SAL_CALL PresenterPreviewCache_createInstance ( return Reference<XInterface>(static_cast<XWeak*>(new PresenterPreviewCache(rxContext))); } - - - OUString PresenterPreviewCache_getImplementationName (void) throw(RuntimeException) { return OUString("com.sun.star.comp.Draw.PresenterPreviewCache"); } - - - Sequence<OUString> SAL_CALL PresenterPreviewCache_getSupportedServiceNames (void) throw (RuntimeException) { @@ -101,9 +90,6 @@ Sequence<OUString> SAL_CALL PresenterPreviewCache_getSupportedServiceNames (void return Sequence<OUString>(&sServiceName, 1); } - - - //===== PresenterPreviewCache ================================================= PresenterPreviewCache::PresenterPreviewCache (const Reference<XComponentContext>& rxContext) @@ -115,16 +101,10 @@ PresenterPreviewCache::PresenterPreviewCache (const Reference<XComponentContext> (void)rxContext; } - - - PresenterPreviewCache::~PresenterPreviewCache (void) { } - - - //----- XInitialize ----------------------------------------------------------- void SAL_CALL PresenterPreviewCache::initialize (const Sequence<Any>& rArguments) @@ -134,9 +114,6 @@ void SAL_CALL PresenterPreviewCache::initialize (const Sequence<Any>& rArguments throw RuntimeException(); } - - - //----- XSlidePreviewCache ---------------------------------------------------- void SAL_CALL PresenterPreviewCache::setDocumentSlides ( @@ -150,9 +127,6 @@ void SAL_CALL PresenterPreviewCache::setDocumentSlides ( mpCacheContext->SetDocumentSlides(rxSlides, rxDocument); } - - - void SAL_CALL PresenterPreviewCache::setVisibleRange ( sal_Int32 nFirstVisibleSlideIndex, sal_Int32 nLastVisibleSlideIndex) @@ -164,9 +138,6 @@ void SAL_CALL PresenterPreviewCache::setVisibleRange ( mpCacheContext->SetVisibleSlideRange (nFirstVisibleSlideIndex, nLastVisibleSlideIndex); } - - - void SAL_CALL PresenterPreviewCache::setPreviewSize ( const css::geometry::IntegerSize2D& rSize) throw (css::uno::RuntimeException, std::exception) @@ -178,9 +149,6 @@ void SAL_CALL PresenterPreviewCache::setPreviewSize ( mpCache->ChangeSize(maPreviewSize, false); } - - - Reference<rendering::XBitmap> SAL_CALL PresenterPreviewCache::getSlidePreview ( sal_Int32 nSlideIndex, const Reference<rendering::XCanvas>& rxCanvas) @@ -205,9 +173,6 @@ Reference<rendering::XBitmap> SAL_CALL PresenterPreviewCache::getSlidePreview ( aPreview)->getUNOBitmap(); } - - - void SAL_CALL PresenterPreviewCache::addPreviewCreationNotifyListener ( const Reference<drawing::XSlidePreviewCacheListener>& rxListener) throw (css::uno::RuntimeException, std::exception) @@ -218,9 +183,6 @@ void SAL_CALL PresenterPreviewCache::addPreviewCreationNotifyListener ( mpCacheContext->AddPreviewCreationNotifyListener(rxListener); } - - - void SAL_CALL PresenterPreviewCache::removePreviewCreationNotifyListener ( const css::uno::Reference<css::drawing::XSlidePreviewCacheListener>& rxListener) throw (css::uno::RuntimeException, std::exception) @@ -229,9 +191,6 @@ void SAL_CALL PresenterPreviewCache::removePreviewCreationNotifyListener ( mpCacheContext->RemovePreviewCreationNotifyListener(rxListener); } - - - void SAL_CALL PresenterPreviewCache::pause (void) throw (css::uno::RuntimeException, std::exception) { @@ -240,9 +199,6 @@ void SAL_CALL PresenterPreviewCache::pause (void) mpCache->Pause(); } - - - void SAL_CALL PresenterPreviewCache::resume (void) throw (css::uno::RuntimeException, std::exception) { @@ -251,11 +207,6 @@ void SAL_CALL PresenterPreviewCache::resume (void) mpCache->Resume(); } - - - - - void PresenterPreviewCache::ThrowIfDisposed (void) throw (::com::sun::star::lang::DisposedException) { @@ -266,12 +217,8 @@ void PresenterPreviewCache::ThrowIfDisposed (void) } } - - - //===== PresenterPreviewCache::PresenterCacheContext ========================== - PresenterPreviewCache::PresenterCacheContext::PresenterCacheContext (void) : mxSlides(), mxDocument(), @@ -281,16 +228,10 @@ PresenterPreviewCache::PresenterCacheContext::PresenterCacheContext (void) { } - - - PresenterPreviewCache::PresenterCacheContext::~PresenterCacheContext (void) { } - - - void PresenterPreviewCache::PresenterCacheContext::SetDocumentSlides ( const Reference<container::XIndexAccess>& rxSlides, const Reference<XInterface>& rxDocument) @@ -301,9 +242,6 @@ void PresenterPreviewCache::PresenterCacheContext::SetDocumentSlides ( mnLastVisibleSlideIndex = -1; } - - - void PresenterPreviewCache::PresenterCacheContext::SetVisibleSlideRange ( const sal_Int32 nFirstVisibleSlideIndex, const sal_Int32 nLastVisibleSlideIndex) @@ -322,18 +260,12 @@ void PresenterPreviewCache::PresenterCacheContext::SetVisibleSlideRange ( mnLastVisibleSlideIndex = mxSlides->getCount() - 1; } - - - void PresenterPreviewCache::PresenterCacheContext::AddPreviewCreationNotifyListener ( const Reference<drawing::XSlidePreviewCacheListener>& rxListener) { maListeners.push_back(rxListener); } - - - void PresenterPreviewCache::PresenterCacheContext::RemovePreviewCreationNotifyListener ( const Reference<drawing::XSlidePreviewCacheListener>& rxListener) { @@ -346,9 +278,6 @@ void PresenterPreviewCache::PresenterCacheContext::RemovePreviewCreationNotifyLi } } - - - //----- CacheContext ---------------------------------------------------------- void PresenterPreviewCache::PresenterCacheContext::NotifyPreviewCreation ( @@ -365,17 +294,11 @@ void PresenterPreviewCache::PresenterCacheContext::NotifyPreviewCreation ( CallListeners(nIndex); } - - - bool PresenterPreviewCache::PresenterCacheContext::IsIdle (void) { return true; } - - - bool PresenterPreviewCache::PresenterCacheContext::IsVisible (CacheKey aKey) { if (mnFirstVisibleSlideIndex < 0) @@ -389,17 +312,11 @@ bool PresenterPreviewCache::PresenterCacheContext::IsVisible (CacheKey aKey) return false; } - - - const SdrPage* PresenterPreviewCache::PresenterCacheContext::GetPage (CacheKey aKey) { return static_cast<const SdrPage*>(aKey); } - - - ::boost::shared_ptr<std::vector<CacheKey> > PresenterPreviewCache::PresenterCacheContext::GetEntryList (bool bVisible) { @@ -422,9 +339,6 @@ const SdrPage* PresenterPreviewCache::PresenterCacheContext::GetPage (CacheKey a return pKeys; } - - - sal_Int32 PresenterPreviewCache::PresenterCacheContext::GetPriority (CacheKey aKey) { if ( ! mxSlides.is()) @@ -443,19 +357,11 @@ sal_Int32 PresenterPreviewCache::PresenterCacheContext::GetPriority (CacheKey aK return 0; } - - - Reference<XInterface> PresenterPreviewCache::PresenterCacheContext::GetModel (void) { return mxDocument; } - - - - - const SdrPage* PresenterPreviewCache::PresenterCacheContext::GetPage ( const sal_Int32 nSlideIndex) const { @@ -469,9 +375,6 @@ const SdrPage* PresenterPreviewCache::PresenterCacheContext::GetPage ( return dynamic_cast<const SdrPage*>(pPage); } - - - void PresenterPreviewCache::PresenterCacheContext::CallListeners ( const sal_Int32 nIndex) { diff --git a/sd/source/ui/presenter/PresenterPreviewCache.hxx b/sd/source/ui/presenter/PresenterPreviewCache.hxx index a31423d5d7a5..28e7be95957a 100644 --- a/sd/source/ui/presenter/PresenterPreviewCache.hxx +++ b/sd/source/ui/presenter/PresenterPreviewCache.hxx @@ -57,7 +57,6 @@ public: virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) throw(css::uno::Exception,css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XSlidePreviewCache virtual void SAL_CALL setDocumentSlides ( diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index aa8a17470341..621577eb5a7c 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "PresenterTextView.hxx" #include "facreg.hxx" @@ -44,7 +43,6 @@ #include <com/sun/star/util/Color.hpp> #include <com/sun/star/i18n/ScriptType.hpp> - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -58,17 +56,11 @@ Reference<XInterface> SAL_CALL PresenterTextViewService_createInstance ( return Reference<XInterface>(static_cast<XWeak*>(new PresenterTextView(rxContext))); } - - - OUString PresenterTextViewService_getImplementationName (void) throw(RuntimeException) { return OUString("com.sun.star.comp.Draw.PresenterTextView"); } - - - Sequence<OUString> SAL_CALL PresenterTextViewService_getSupportedServiceNames (void) throw (RuntimeException) { @@ -76,8 +68,6 @@ Sequence<OUString> SAL_CALL PresenterTextViewService_getSupportedServiceNames (v return Sequence<OUString>(&sServiceName, 1); } - - // PresenterTextView::Implementation class PresenterTextView::Implementation { @@ -125,9 +115,6 @@ private: void CheckTop (void); }; - - - // PresenterTextView PresenterTextView::PresenterTextView (const Reference<XComponentContext>& rxContext) : PresenterTextViewInterfaceBase(), @@ -136,24 +123,15 @@ PresenterTextView::PresenterTextView (const Reference<XComponentContext>& rxCont (void)rxContext; } - - - PresenterTextView::~PresenterTextView (void) { } - - - void SAL_CALL PresenterTextView::disposing (void) { mpImplementation.reset(); } - - - // XInitialization void SAL_CALL PresenterTextView::initialize (const Sequence<Any>& rArguments) throw (Exception, RuntimeException, std::exception) @@ -183,11 +161,6 @@ void SAL_CALL PresenterTextView::initialize (const Sequence<Any>& rArguments) } } - - - - - Any PresenterTextView::GetPropertyValue (const OUString& rsPropertyName) { ThrowIfDisposed(); @@ -208,9 +181,6 @@ Any PresenterTextView::GetPropertyValue (const OUString& rsPropertyName) return Any(); } - - - Any PresenterTextView::SetPropertyValue ( const OUString& rsPropertyName, const css::uno::Any& rValue) @@ -265,9 +235,6 @@ Any PresenterTextView::SetPropertyValue ( return aOldValue; } - - - void PresenterTextView::ThrowIfDisposed (void) throw (::com::sun::star::lang::DisposedException) { @@ -280,9 +247,6 @@ void PresenterTextView::ThrowIfDisposed (void) } } - - - // PresenterTextView::Implementation PresenterTextView::Implementation::Implementation (void) : msTextPropertyName("Text"), @@ -311,9 +275,6 @@ PresenterTextView::Implementation::Implementation (void) GetEditEngine(); } - - - PresenterTextView::Implementation::~Implementation (void) { delete mpEditEngine; @@ -321,9 +282,6 @@ PresenterTextView::Implementation::~Implementation (void) delete mpOutputDevice; } - - - EditEngine * PresenterTextView::Implementation::GetEditEngine (void) { if (mpEditEngine == NULL) @@ -331,9 +289,6 @@ EditEngine * PresenterTextView::Implementation::GetEditEngine (void) return mpEditEngine; } - - - EditEngine* PresenterTextView::Implementation::CreateEditEngine (void) { EditEngine* pEditEngine = mpEditEngine; @@ -383,7 +338,6 @@ EditEngine* PresenterTextView::Implementation::CreateEditEngine (void) rFntDta.nFontInfoId)); } - pEditEngine = new EditEngine (mpEditEngineItemPool); pEditEngine->EnableUndo (true); @@ -406,18 +360,12 @@ EditEngine* PresenterTextView::Implementation::CreateEditEngine (void) return pEditEngine; } - - - void PresenterTextView::Implementation::SetCanvas (const cppcanvas::CanvasSharedPtr& rpCanvas) { mpCanvas = rpCanvas; mxBitmap = NULL; } - - - void PresenterTextView::Implementation::SetSize (const Size aSize) { DBG_ASSERT(mpEditEngine!=NULL, "EditEngine missing"); @@ -428,9 +376,6 @@ void PresenterTextView::Implementation::SetSize (const Size aSize) mxBitmap = NULL; } - - - void PresenterTextView::Implementation::SetBackgroundColor (const Color aColor) { maBackgroundColor = aColor; @@ -443,9 +388,6 @@ void PresenterTextView::Implementation::SetBackgroundColor (const Color aColor) mpEditEngine->ForceAutoColor(false); } - - - void PresenterTextView::Implementation::SetTextColor (const Color aColor) { maTextColor = aColor; @@ -455,9 +397,6 @@ void PresenterTextView::Implementation::SetTextColor (const Color aColor) mpEditEngineItemPool->SetPoolDefaultItem(SvxColorItem(aColor, EE_CHAR_COLOR)); } - - - void PresenterTextView::Implementation::SetFontDescriptor ( const awt::FontDescriptor& rFontDescriptor) { @@ -489,13 +428,6 @@ void PresenterTextView::Implementation::SetFontDescriptor ( mnTotalHeight = -1; } - - - - - - - void PresenterTextView::Implementation::SetTop (const sal_Int32 nTop) { if (nTop == mnTop) @@ -506,9 +438,6 @@ void PresenterTextView::Implementation::SetTop (const sal_Int32 nTop) CheckTop(); } - - - void PresenterTextView::Implementation::SetText (const OUString& rText) { DBG_ASSERT(mpEditEngine!=NULL, "EditEngine missing"); @@ -518,9 +447,6 @@ void PresenterTextView::Implementation::SetText (const OUString& rText) mxBitmap = NULL; } - - - sal_Int32 PresenterTextView::Implementation::ParseDistance (const OUString& rsDistance) const { DBG_ASSERT(mpEditEngine!=NULL, "EditEngine missing"); @@ -540,9 +466,6 @@ sal_Int32 PresenterTextView::Implementation::ParseDistance (const OUString& rsDi return nDistance; } - - - Reference<rendering::XBitmap> PresenterTextView::Implementation::GetBitmap (void) { DBG_ASSERT(mpEditEngine!=NULL, "EditEngine missing"); @@ -580,9 +503,6 @@ Reference<rendering::XBitmap> PresenterTextView::Implementation::GetBitmap (void return mxBitmap; } - - - sal_Int32 PresenterTextView::Implementation::GetTotalHeight (void) { DBG_ASSERT(mpEditEngine!=NULL, "EditEngine missing"); @@ -596,9 +516,6 @@ sal_Int32 PresenterTextView::Implementation::GetTotalHeight (void) return mnTotalHeight; } - - - void PresenterTextView::Implementation::CheckTop (void) { DBG_ASSERT(mpEditEngine!=NULL, "EditEngine missing"); @@ -618,7 +535,6 @@ void PresenterTextView::Implementation::CheckTop (void) mnTop = 0; } - } } // end of namespace ::sd::presenter /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/presenter/PresenterTextView.hxx b/sd/source/ui/presenter/PresenterTextView.hxx index 7bb018773482..21a878dcc698 100644 --- a/sd/source/ui/presenter/PresenterTextView.hxx +++ b/sd/source/ui/presenter/PresenterTextView.hxx @@ -41,7 +41,6 @@ namespace { > PresenterTextViewInterfaceBase; } - /** Render text into bitmaps. An edit engine is used to render the text. This service is used by the presenter screen to render the notes view. */ @@ -58,7 +57,6 @@ public: virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - protected: virtual void SAL_CALL disposing (void) SAL_OVERRIDE; diff --git a/sd/source/ui/presenter/SlideRenderer.cxx b/sd/source/ui/presenter/SlideRenderer.cxx index 0526a0de7bee..0865d0df219e 100644 --- a/sd/source/ui/presenter/SlideRenderer.cxx +++ b/sd/source/ui/presenter/SlideRenderer.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "SlideRenderer.hxx" #include "facreg.hxx" #include "sdpage.hxx" @@ -40,17 +39,11 @@ Reference<XInterface> SAL_CALL SlideRenderer_createInstance ( return Reference<XInterface>(static_cast<XWeak*>(new SlideRenderer(rxContext))); } - - - OUString SlideRenderer_getImplementationName (void) throw(RuntimeException) { return OUString("com.sun.star.comp.Draw.SlideRenderer"); } - - - Sequence<OUString> SAL_CALL SlideRenderer_getSupportedServiceNames (void) throw (RuntimeException) { @@ -58,9 +51,6 @@ Sequence<OUString> SAL_CALL SlideRenderer_getSupportedServiceNames (void) return Sequence<OUString>(&sServiceName, 1); } - - - //===== SlideRenderer ========================================================== SlideRenderer::SlideRenderer (const Reference<XComponentContext>& rxContext) @@ -70,23 +60,14 @@ SlideRenderer::SlideRenderer (const Reference<XComponentContext>& rxContext) (void)rxContext; } - - - SlideRenderer::~SlideRenderer (void) { } - - - void SAL_CALL SlideRenderer::disposing (void) { } - - - //----- XInitialization ------------------------------------------------------- void SAL_CALL SlideRenderer::initialize (const Sequence<Any>& rArguments) @@ -101,9 +82,6 @@ void SAL_CALL SlideRenderer::initialize (const Sequence<Any>& rArguments) } } - - - //----- XSlideRenderer -------------------------------------------------------- Reference<awt::XBitmap> SlideRenderer::createPreview ( @@ -119,9 +97,6 @@ Reference<awt::XBitmap> SlideRenderer::createPreview ( CreatePreview(rxSlide, rMaximalSize, nSuperSampleFactor)); } - - - Reference<rendering::XBitmap> SlideRenderer::createPreviewForCanvas ( const Reference<drawing::XDrawPage>& rxSlide, const awt::Size& rMaximalSize, @@ -142,9 +117,6 @@ Reference<rendering::XBitmap> SlideRenderer::createPreviewForCanvas ( return NULL; } - - - awt::Size SAL_CALL SlideRenderer::calculatePreviewSize ( double nSlideAspectRatio, const awt::Size& rMaximalSize) @@ -168,11 +140,6 @@ awt::Size SAL_CALL SlideRenderer::calculatePreviewSize ( sal::static_int_cast<sal_Int32>(rMaximalSize.Width / nSlideAspectRatio)); } - - - - - BitmapEx SlideRenderer::CreatePreview ( const Reference<drawing::XDrawPage>& rxSlide, const awt::Size& rMaximalSize, @@ -230,9 +197,6 @@ BitmapEx SlideRenderer::CreatePreview ( } } - - - void SlideRenderer::ThrowIfDisposed (void) throw (::com::sun::star::lang::DisposedException) { @@ -243,7 +207,6 @@ void SlideRenderer::ThrowIfDisposed (void) } } - } } // end of namespace ::sd::presenter /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/presenter/SlideRenderer.hxx b/sd/source/ui/presenter/SlideRenderer.hxx index 06eda5ab06f3..813d21277b99 100644 --- a/sd/source/ui/presenter/SlideRenderer.hxx +++ b/sd/source/ui/presenter/SlideRenderer.hxx @@ -40,7 +40,6 @@ namespace { > SlideRendererInterfaceBase; } - /** Render single slides into bitmaps. */ class SlideRenderer @@ -53,13 +52,11 @@ public: virtual ~SlideRenderer (void); virtual void SAL_CALL disposing (void) SAL_OVERRIDE; - // XInitialization virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XSlideRenderer virtual css::uno::Reference<css::awt::XBitmap> SAL_CALL createPreview ( diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx index a447900a716f..f2f17330db07 100644 --- a/sd/source/ui/remotecontrol/BluetoothServer.cxx +++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx @@ -210,7 +210,6 @@ isBluez5Available(DBusConnection *pConnection) return true; } - static DBusObject* getBluez5Adapter(DBusConnection *pConnection) { @@ -1182,7 +1181,6 @@ void SAL_CALL BluetoothServer::run() if( !pConnection ) return; - // For either implementation we need to poll the dbus fd int fd = -1; GPollFD aDBusFD; diff --git a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx index 4417e09130f7..7633283f3237 100644 --- a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx +++ b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx @@ -116,7 +116,6 @@ sal_Int32 BufferedStreamSocket::readLine( OString& aLine ) aRead += aRet; } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/remotecontrol/ImagePreparer.cxx b/sd/source/ui/remotecontrol/ImagePreparer.cxx index 3a022b2d4975..fb6aacf93ba9 100644 --- a/sd/source/ui/remotecontrol/ImagePreparer.cxx +++ b/sd/source/ui/remotecontrol/ImagePreparer.cxx @@ -220,7 +220,6 @@ OString ImagePreparer::prepareNotes( sal_uInt32 aSlideNumber ) else return ""; - static const OUString sNotesShapeName ( "com.sun.star.presentation.NotesShape" ); static const OUString sTextShapeName ( diff --git a/sd/source/ui/remotecontrol/ImagePreparer.hxx b/sd/source/ui/remotecontrol/ImagePreparer.hxx index 6790a70bb328..d0837fc5dcce 100644 --- a/sd/source/ui/remotecontrol/ImagePreparer.hxx +++ b/sd/source/ui/remotecontrol/ImagePreparer.hxx @@ -43,6 +43,5 @@ private: } - #endif // INCLUDED_SD_SOURCE_UI_REMOTECONTROL_IMAGEPREPARER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/remotecontrol/Listener.cxx b/sd/source/ui/remotecontrol/Listener.cxx index 5237d53a7928..2bc86be2f671 100644 --- a/sd/source/ui/remotecontrol/Listener.cxx +++ b/sd/source/ui/remotecontrol/Listener.cxx @@ -16,12 +16,10 @@ #include "Listener.hxx" #include "ImagePreparer.hxx" - using namespace sd; using namespace ::com::sun::star::presentation; using namespace ::com::sun::star::frame; - Listener::Listener( const ::rtl::Reference<Communicator>& rCommunicator, sd::Transmitter *aTransmitter ): ::cppu::WeakComponentImplHelper1< XSlideShowListener >( m_aMutex ), diff --git a/sd/source/ui/remotecontrol/OSXNetworkService.hxx b/sd/source/ui/remotecontrol/OSXNetworkService.hxx index 5873c1aee5b6..4f84fd594498 100644 --- a/sd/source/ui/remotecontrol/OSXNetworkService.hxx +++ b/sd/source/ui/remotecontrol/OSXNetworkService.hxx @@ -9,7 +9,6 @@ #ifndef INCLUDED_SD_SOURCE_UI_REMOTECONTROL_OSXNETWORKSERVICE_HXX #define INCLUDED_SD_SOURCE_UI_REMOTECONTROL_OSXNETWORKSERVICE_HXX - #include <errno.h> #include <stdlib.h> #include <string.h> @@ -43,4 +42,4 @@ namespace sd { }; }; } -#endif
\ No newline at end of file +#endif diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx index 25045b2ccb78..ff42804d77a7 100644 --- a/sd/source/ui/remotecontrol/Server.cxx +++ b/sd/source/ui/remotecontrol/Server.cxx @@ -193,7 +193,6 @@ void RemoteServer::setup() #endif } - void RemoteServer::presentationStarted( const css::uno::Reference< css::presentation::XSlideShowController > &rController ) { diff --git a/sd/source/ui/remotecontrol/Transmitter.cxx b/sd/source/ui/remotecontrol/Transmitter.cxx index cc7b8ec8bf76..a217d5841055 100644 --- a/sd/source/ui/remotecontrol/Transmitter.cxx +++ b/sd/source/ui/remotecontrol/Transmitter.cxx @@ -82,5 +82,4 @@ void Transmitter::addMessage( const OString& aMessage, const Priority aPriority } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/remotecontrol/WINNetworkService.hxx b/sd/source/ui/remotecontrol/WINNetworkService.hxx index 82ba706d1783..0ca284feea0c 100644 --- a/sd/source/ui/remotecontrol/WINNetworkService.hxx +++ b/sd/source/ui/remotecontrol/WINNetworkService.hxx @@ -23,4 +23,4 @@ namespace sd{ }; } -#endif
\ No newline at end of file +#endif diff --git a/sd/source/ui/sidebar/AllMasterPagesSelector.cxx b/sd/source/ui/sidebar/AllMasterPagesSelector.cxx index 1b74b8f16c66..19f825822e3e 100644 --- a/sd/source/ui/sidebar/AllMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/AllMasterPagesSelector.cxx @@ -48,7 +48,6 @@ int GetURLPriority (const SharedMasterPageDescriptor& rpDescriptor) return nPriority; } - class MasterPageDescriptorOrder { public: @@ -69,8 +68,6 @@ public: } // end of anonymous namespace - - namespace sd { namespace sidebar { class AllMasterPagesSelector::SortedMasterPageDescriptorList @@ -80,9 +77,6 @@ public: SortedMasterPageDescriptorList (void) {} }; - - - MasterPagesSelector* AllMasterPagesSelector::Create ( ::Window* pParent, ViewShellBase& rViewShellBase, @@ -107,9 +101,6 @@ MasterPagesSelector* AllMasterPagesSelector::Create ( return pSelector; } - - - AllMasterPagesSelector::AllMasterPagesSelector ( ::Window* pParent, SdDrawDocument& rDocument, @@ -122,16 +113,10 @@ AllMasterPagesSelector::AllMasterPagesSelector ( MasterPagesSelector::Fill(); } - - - AllMasterPagesSelector::~AllMasterPagesSelector (void) { } - - - void AllMasterPagesSelector::Fill (ItemList& rItemList) { if (mpSortedMasterPages->empty()) @@ -139,9 +124,6 @@ void AllMasterPagesSelector::Fill (ItemList& rItemList) UpdatePageSet(rItemList); } - - - void AllMasterPagesSelector::NotifyContainerChangeEvent ( const MasterPageContainerChangeEvent& rEvent) { @@ -164,9 +146,6 @@ void AllMasterPagesSelector::NotifyContainerChangeEvent ( } } - - - void AllMasterPagesSelector::UpdateMasterPageList (void) { mpSortedMasterPages->clear(); @@ -175,9 +154,6 @@ void AllMasterPagesSelector::UpdateMasterPageList (void) AddItem(mpContainer->GetTokenForIndex(i)); } - - - void AllMasterPagesSelector::AddItem (MasterPageContainer::Token aToken) { switch (mpContainer->GetOriginForToken(aToken)) @@ -198,9 +174,6 @@ void AllMasterPagesSelector::AddItem (MasterPageContainer::Token aToken) } } - - - void AllMasterPagesSelector::UpdatePageSet (ItemList& rItemList) { SortedMasterPageDescriptorList::const_iterator iDescriptor; @@ -209,9 +182,6 @@ void AllMasterPagesSelector::UpdatePageSet (ItemList& rItemList) rItemList.push_back((*iDescriptor)->maToken); } - - - void AllMasterPagesSelector::GetState (SfxItemSet& rItemSet) { // MasterPagesSelector::GetState(rItemSet); @@ -220,9 +190,6 @@ void AllMasterPagesSelector::GetState (SfxItemSet& rItemSet) rItemSet.DisableItem(SID_TP_EDIT_MASTER); } - - - } } // end of namespace sd::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx index 00c19f2e5307..56cef88ffdd3 100644 --- a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx @@ -30,7 +30,6 @@ class TemplateEntry; namespace sd { namespace sidebar { - /** Show a list of all available master pages so that the user can assign them to the document. */ diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx index dc793a14615a..1b5807150e41 100644 --- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx @@ -38,7 +38,6 @@ #include <set> - using namespace ::com::sun::star; namespace sd { namespace sidebar { @@ -67,9 +66,6 @@ MasterPagesSelector* CurrentMasterPagesSelector::Create ( return pSelector; } - - - CurrentMasterPagesSelector::CurrentMasterPagesSelector ( ::Window* pParent, SdDrawDocument& rDocument, @@ -93,9 +89,6 @@ CurrentMasterPagesSelector::CurrentMasterPagesSelector ( | sd::tools::EventMultiplexerEvent::EID_SHAPE_REMOVED); } - - - CurrentMasterPagesSelector::~CurrentMasterPagesSelector (void) { if (mrDocument.GetDocSh() != NULL) @@ -111,9 +104,6 @@ CurrentMasterPagesSelector::~CurrentMasterPagesSelector (void) mrBase.GetEventMultiplexer()->RemoveEventListener(aLink); } - - - void CurrentMasterPagesSelector::LateInit (void) { MasterPagesSelector::LateInit(); @@ -128,9 +118,6 @@ void CurrentMasterPagesSelector::LateInit (void) } } - - - void CurrentMasterPagesSelector::Fill (ItemList& rItemList) { sal_uInt16 nPageCount = mrDocument.GetMasterSdPageCount(PK_STANDARD); @@ -171,17 +158,11 @@ void CurrentMasterPagesSelector::Fill (ItemList& rItemList) } } - - - ResId CurrentMasterPagesSelector::GetContextMenuResId (void) const { return SdResId(RID_TASKPANE_CURRENT_MASTERPAGESSELECTOR_POPUP); } - - - void CurrentMasterPagesSelector::UpdateSelection (void) { // Iterate over all pages and for the selected ones put the name of @@ -228,9 +209,6 @@ void CurrentMasterPagesSelector::UpdateSelection (void) } } - - - void CurrentMasterPagesSelector::ExecuteCommand (const sal_Int32 nCommandId) { if (nCommandId == SID_DELETE_MASTER_PAGE) @@ -251,9 +229,6 @@ void CurrentMasterPagesSelector::ExecuteCommand (const sal_Int32 nCommandId) MasterPagesSelector::ExecuteCommand(nCommandId); } - - - void CurrentMasterPagesSelector::ProcessPopupMenu (Menu& rMenu) { // Disable the SID_DELTE_MASTER slot when there is only one master page. @@ -275,11 +250,6 @@ void CurrentMasterPagesSelector::ProcessPopupMenu (Menu& rMenu) MasterPagesSelector::ProcessPopupMenu(rMenu); } - - - - - IMPL_LINK(CurrentMasterPagesSelector,EventMultiplexerListener, sd::tools::EventMultiplexerEvent*,pEvent) { diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx index 8ff1455a5432..d233980ab0a6 100644 --- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx @@ -25,13 +25,10 @@ namespace cssu = ::com::sun::star::uno; - namespace sd { namespace tools { class EventMultiplexerEvent; } } - namespace sd { namespace sidebar { - /** Show the master pages currently used by a SdDrawDocument. */ class CurrentMasterPagesSelector diff --git a/sd/source/ui/sidebar/CustomAnimationPanel.cxx b/sd/source/ui/sidebar/CustomAnimationPanel.cxx index 56a425e782ed..c0ed23cc4bcf 100644 --- a/sd/source/ui/sidebar/CustomAnimationPanel.cxx +++ b/sd/source/ui/sidebar/CustomAnimationPanel.cxx @@ -24,7 +24,6 @@ namespace sd { namespace sidebar { - CustomAnimationPanel::CustomAnimationPanel ( ::Window* pParentWindow, ViewShellBase& rViewShellBase, @@ -40,16 +39,10 @@ CustomAnimationPanel::CustomAnimationPanel ( #endif } - - - CustomAnimationPanel::~CustomAnimationPanel (void) { } - - - ::Window* CustomAnimationPanel::CreateWrappedControl ( ::Window* pParentWindow, ViewShellBase& rViewShellBase) @@ -57,9 +50,6 @@ CustomAnimationPanel::~CustomAnimationPanel (void) return createCustomAnimationPanel(pParentWindow, rViewShellBase, mxFrame); } - - - css::ui::LayoutSize CustomAnimationPanel::GetHeightForWidth (const sal_Int32 /*nWidth*/) { Window *pControl = mpWrappedControl.get(); @@ -67,7 +57,6 @@ css::ui::LayoutSize CustomAnimationPanel::GetHeightForWidth (const sal_Int32 /*n return css::ui::LayoutSize(nMinimumHeight,-1, nMinimumHeight); } - } } // end of namespace sd::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/sidebar/DocumentHelper.cxx b/sd/source/ui/sidebar/DocumentHelper.cxx index a96b55c49c2d..0b59b8330edf 100644 --- a/sd/source/ui/sidebar/DocumentHelper.cxx +++ b/sd/source/ui/sidebar/DocumentHelper.cxx @@ -87,7 +87,6 @@ SdPage* DocumentHelper::CopyMasterPageToLocalDocument ( if (pNotesMasterPage == NULL) break; - // Check if a master page with the same name as that of the given // master page already exists. bool bPageExists (false); @@ -155,9 +154,6 @@ SdPage* DocumentHelper::CopyMasterPageToLocalDocument ( return pNewMasterPage; } - - - SdPage* DocumentHelper::GetSlideForMasterPage (SdPage* pMasterPage) { SdPage* pCandidate = NULL; @@ -204,9 +200,6 @@ SdPage* DocumentHelper::GetSlideForMasterPage (SdPage* pMasterPage) return pCandidate; } - - - SdPage* DocumentHelper::AddMasterPage ( SdDrawDocument& rTargetDocument, SdPage* pMasterPage) @@ -253,9 +246,6 @@ SdPage* DocumentHelper::AddMasterPage ( return pClonedMasterPage; } - - - void DocumentHelper::ProvideStyles ( SdDrawDocument& rSourceDocument, SdDrawDocument& rTargetDocument, @@ -294,9 +284,6 @@ void DocumentHelper::ProvideStyles ( } } - - - void DocumentHelper::AssignMasterPageToPageList ( SdDrawDocument& rTargetDocument, SdPage* pMasterPage, @@ -354,9 +341,6 @@ void DocumentHelper::AssignMasterPageToPageList ( pUndoMgr->LeaveListAction(); } - - - SdPage* DocumentHelper::AddMasterPage ( SdDrawDocument& rTargetDocument, SdPage* pMasterPage, @@ -400,9 +384,6 @@ SdPage* DocumentHelper::AddMasterPage ( return pClonedMasterPage; } - - - /** In here we have to handle three cases: 1. pPage is a normal slide. We can use SetMasterPage to assign the master pages to it. @@ -483,9 +464,6 @@ void DocumentHelper::AssignMasterPageToPage ( } } - - - SdPage* DocumentHelper::ProvideMasterPage ( SdDrawDocument& rTargetDocument, SdPage* pMasterPage, @@ -565,10 +543,6 @@ SdPage* DocumentHelper::ProvideMasterPage ( return pMasterPageInDocument; } - - - - } } // end of namespace sd::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/sidebar/DocumentHelper.hxx b/sd/source/ui/sidebar/DocumentHelper.hxx index c243127595fd..0c457b209dc6 100644 --- a/sd/source/ui/sidebar/DocumentHelper.hxx +++ b/sd/source/ui/sidebar/DocumentHelper.hxx @@ -101,7 +101,6 @@ private: SdPage* pPage); }; - } } // end of namespace sd::sidebar #endif diff --git a/sd/source/ui/sidebar/IDisposable.hxx b/sd/source/ui/sidebar/IDisposable.hxx index a03533e3719a..ef68ac282788 100644 --- a/sd/source/ui/sidebar/IDisposable.hxx +++ b/sd/source/ui/sidebar/IDisposable.hxx @@ -26,7 +26,6 @@ class Window; namespace sd { namespace sidebar { - class IDisposable { public: @@ -34,7 +33,6 @@ public: virtual ~IDisposable(); }; - } } // end of namespace ::sd::sidebar #endif diff --git a/sd/source/ui/sidebar/ISidebarReceiver.hxx b/sd/source/ui/sidebar/ISidebarReceiver.hxx index aa15c6d93a84..2c5867391981 100644 --- a/sd/source/ui/sidebar/ISidebarReceiver.hxx +++ b/sd/source/ui/sidebar/ISidebarReceiver.hxx @@ -23,7 +23,6 @@ namespace sd { namespace sidebar { - class ISidebarReceiver { public: @@ -32,7 +31,6 @@ public: virtual ~ISidebarReceiver(); }; - } } // end of namespace ::sd::sidebar #endif diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index 7bd90a03ccaa..a6fa641cbd0f 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -65,8 +65,6 @@ using ::sd::framework::FrameworkHelper; namespace sd { namespace sidebar { - - struct snewfoil_value_info { sal_uInt16 mnBmpResId; @@ -122,9 +120,6 @@ static const snewfoil_value_info standard[] = {0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE} }; - - - LayoutMenu::LayoutMenu ( ::Window* pParent, ViewShellBase& rViewShellBase, @@ -154,9 +149,6 @@ LayoutMenu::LayoutMenu ( #endif } - - - void LayoutMenu::implConstruct( DrawDocShell& rDocumentShell ) { OSL_ENSURE( mrBase.GetDocument()->GetDocSh() == &rDocumentShell, @@ -200,18 +192,12 @@ void LayoutMenu::implConstruct( DrawDocShell& rDocumentShell ) GetParent()->AddEventListener(aWindowEventHandlerLink); } - - - LayoutMenu::~LayoutMenu (void) { OSL_TRACE("destroying LayoutMenu at %x", this); Dispose(); } - - - void LayoutMenu::Dispose (void) { if (mbIsDisposed) @@ -233,9 +219,6 @@ void LayoutMenu::Dispose (void) GetParent()->RemoveEventListener(aWindowEventHandlerLink); } - - - AutoLayout LayoutMenu::GetSelectedAutoLayout (void) { AutoLayout aResult = AUTOLAYOUT_NONE; @@ -273,9 +256,6 @@ ui::LayoutSize LayoutMenu::GetHeightForWidth (const sal_Int32 nWidth) return ui::LayoutSize(nPreferredHeight,nPreferredHeight,nPreferredHeight); } - - - void LayoutMenu::Paint (const Rectangle& rRect) { if (mbSelectionUpdatePending) @@ -286,9 +266,6 @@ void LayoutMenu::Paint (const Rectangle& rRect) ValueSet::Paint (rRect); } - - - void LayoutMenu::Resize (void) { Size aWindowSize = GetOutputSizePixel(); @@ -318,9 +295,6 @@ void LayoutMenu::Resize (void) ValueSet::Resize (); } - - - void LayoutMenu::MouseButtonDown (const MouseEvent& rEvent) { // As a preparation for the context menu the item under the mouse is @@ -336,9 +310,6 @@ void LayoutMenu::MouseButtonDown (const MouseEvent& rEvent) ValueSet::MouseButtonDown (rEvent); } - - - void LayoutMenu::InsertPageWithLayout (AutoLayout aLayout) { ViewShell* pViewShell = mrBase.GetMainViewShell().get(); @@ -366,9 +337,6 @@ void LayoutMenu::InsertPageWithLayout (AutoLayout aLayout) UpdateSelection(); } - - - void LayoutMenu::InvalidateContent (void) { // Throw away the current set and fill the menu anew according to the @@ -379,9 +347,6 @@ void LayoutMenu::InvalidateContent (void) mxSidebar->requestLayout(); } - - - int LayoutMenu::CalculateRowCount (const Size&, int nColumnCount) { int nRowCount = 0; @@ -397,18 +362,12 @@ int LayoutMenu::CalculateRowCount (const Size&, int nColumnCount) return nRowCount; } - - - IMPL_LINK_NOARG(LayoutMenu, ClickHandler) { AssignLayoutToSelectedSlides (GetSelectedAutoLayout()); return 0; } - - - /** The specified layout is assigned to the current page of the view shell in the center pane. */ @@ -478,7 +437,6 @@ void LayoutMenu::AssignLayoutToSelectedSlides (AutoLayout aLayout) pPageSelection->push_back(pMainViewShell->GetActualPage()); } - if (pPageSelection->empty()) break; @@ -498,9 +456,6 @@ void LayoutMenu::AssignLayoutToSelectedSlides (AutoLayout aLayout) while(false); } - - - SfxRequest LayoutMenu::CreateRequest ( sal_uInt16 nSlotId, AutoLayout aLayout) @@ -538,9 +493,6 @@ SfxRequest LayoutMenu::CreateRequest ( return aRequest; } - - - void LayoutMenu::Fill (void) { SvtLanguageOptions aLanguageOptions; @@ -607,9 +559,6 @@ void LayoutMenu::Fill (void) mbSelectionUpdatePending = true; } - - - void LayoutMenu::Clear (void) { for (sal_uInt16 nId=1; nId<=GetItemCount(); nId++) @@ -617,31 +566,20 @@ void LayoutMenu::Clear (void) ValueSet::Clear(); } - - void LayoutMenu::StartDrag (sal_Int8 , const Point& ) { } - - - sal_Int8 LayoutMenu::AcceptDrop (const AcceptDropEvent& ) { return 0; } - - - sal_Int8 LayoutMenu::ExecuteDrop (const ExecuteDropEvent& ) { return 0; } - - - void LayoutMenu::Command (const CommandEvent& rEvent) { switch (rEvent.GetCommand()) @@ -692,18 +630,12 @@ void LayoutMenu::Command (const CommandEvent& rEvent) } } - - - IMPL_LINK_NOARG(LayoutMenu, StateChangeHandler) { InvalidateContent(); return 0; } - - - IMPL_LINK(LayoutMenu, OnMenuItemSelected, Menu*, pMenu) { if (pMenu == NULL) @@ -729,9 +661,6 @@ IMPL_LINK(LayoutMenu, OnMenuItemSelected, Menu*, pMenu) return 0; } - - - void LayoutMenu::UpdateSelection (void) { bool bItemSelected = false; @@ -771,9 +700,6 @@ void LayoutMenu::UpdateSelection (void) SetNoSelection(); } - - - IMPL_LINK(LayoutMenu, EventMultiplexerListener, ::sd::tools::EventMultiplexerEvent*, pEvent) { switch (pEvent->meEventId) @@ -808,9 +734,6 @@ IMPL_LINK(LayoutMenu, EventMultiplexerListener, ::sd::tools::EventMultiplexerEve return 0; } - - - IMPL_LINK(LayoutMenu, WindowEventHandler, VclWindowEvent*, pEvent) { if (pEvent != NULL) @@ -830,9 +753,6 @@ IMPL_LINK(LayoutMenu, WindowEventHandler, VclWindowEvent*, pEvent) return sal_False; } - - - void LayoutMenu::DataChanged (const DataChangedEvent& rEvent) { Fill(); @@ -841,10 +761,6 @@ void LayoutMenu::DataChanged (const DataChangedEvent& rEvent) SetColor(sfx2::sidebar::Theme::GetColor(sfx2::sidebar::Theme::Paint_PanelBackground)); } - - - - } } // end of namespace ::sd::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx b/sd/source/ui/sidebar/LayoutMenu.hxx index cdbb0221c99a..d6b61a26b098 100644 --- a/sd/source/ui/sidebar/LayoutMenu.hxx +++ b/sd/source/ui/sidebar/LayoutMenu.hxx @@ -45,18 +45,15 @@ class DrawDocShell; class ViewShellBase; } - namespace sd { namespace tools { class EventMultiplexerEvent; } } - namespace sd { namespace sidebar { class ControlFactory; class SidebarViewShell; - class LayoutMenu : public ValueSet, public DragSourceHelper, diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx index 8dfc1b807dc3..657e0217b6d1 100644 --- a/sd/source/ui/sidebar/MasterPageContainer.cxx +++ b/sd/source/ui/sidebar/MasterPageContainer.cxx @@ -64,10 +64,8 @@ typedef ::std::vector<sd::sidebar::SharedMasterPageDescriptor> MasterPageContain } // end of anonymous namespace - namespace sd { namespace sidebar { - /** Inner implementation class of the MasterPageContainer. */ class MasterPageContainer::Implementation @@ -178,9 +176,6 @@ private: void CleanContainer (void); }; - - - //===== MasterPageContainer =================================================== ::boost::weak_ptr<MasterPageContainer::Implementation> @@ -220,9 +215,6 @@ private: return pInstance; } - - - MasterPageContainer::MasterPageContainer (void) : mpImpl(Implementation::Instance()), mePreviewSize(SMALL) @@ -230,32 +222,20 @@ MasterPageContainer::MasterPageContainer (void) mpImpl->LateInit(); } - - - MasterPageContainer::~MasterPageContainer (void) { } - - - void MasterPageContainer::AddChangeListener (const Link& rLink) { mpImpl->AddChangeListener(rLink); } - - - void MasterPageContainer::RemoveChangeListener (const Link& rLink) { mpImpl->RemoveChangeListener(rLink); } - - - void MasterPageContainer::SetPreviewSize (PreviewSize eSize) { mePreviewSize = eSize; @@ -264,30 +244,17 @@ void MasterPageContainer::SetPreviewSize (PreviewSize eSize) NIL_TOKEN); } - - - - - - - Size MasterPageContainer::GetPreviewSizePixel (void) const { return mpImpl->GetPreviewSizePixel(mePreviewSize); } - - - MasterPageContainer::Token MasterPageContainer::PutMasterPage ( const SharedMasterPageDescriptor& rDescriptor) { return mpImpl->PutMasterPage(rDescriptor); } - - - void MasterPageContainer::AcquireToken (Token aToken) { SharedMasterPageDescriptor pDescriptor = mpImpl->GetDescriptor(aToken); @@ -297,9 +264,6 @@ void MasterPageContainer::AcquireToken (Token aToken) } } - - - void MasterPageContainer::ReleaseToken (Token aToken) { SharedMasterPageDescriptor pDescriptor = mpImpl->GetDescriptor(aToken); @@ -324,9 +288,6 @@ void MasterPageContainer::ReleaseToken (Token aToken) } } - - - int MasterPageContainer::GetTokenCount (void) const { const ::osl::MutexGuard aGuard (mpImpl->maMutex); @@ -334,9 +295,6 @@ int MasterPageContainer::GetTokenCount (void) const return mpImpl->maContainer.size(); } - - - bool MasterPageContainer::HasToken (Token aToken) const { const ::osl::MutexGuard aGuard (mpImpl->maMutex); @@ -344,9 +302,6 @@ bool MasterPageContainer::HasToken (Token aToken) const return mpImpl->HasToken(aToken); } - - - MasterPageContainer::Token MasterPageContainer::GetTokenForIndex (int nIndex) { const ::osl::MutexGuard aGuard (mpImpl->maMutex); @@ -357,9 +312,6 @@ MasterPageContainer::Token MasterPageContainer::GetTokenForIndex (int nIndex) return aResult; } - - - MasterPageContainer::Token MasterPageContainer::GetTokenForURL ( const OUString& sURL) { @@ -379,9 +331,6 @@ MasterPageContainer::Token MasterPageContainer::GetTokenForURL ( return aResult; } - - - MasterPageContainer::Token MasterPageContainer::GetTokenForStyleName (const OUString& sStyleName) { const ::osl::MutexGuard aGuard (mpImpl->maMutex); @@ -400,9 +349,6 @@ MasterPageContainer::Token MasterPageContainer::GetTokenForStyleName (const OUSt return aResult; } - - - MasterPageContainer::Token MasterPageContainer::GetTokenForPageObject ( const SdPage* pPage) { @@ -422,9 +368,6 @@ MasterPageContainer::Token MasterPageContainer::GetTokenForPageObject ( return aResult; } - - - OUString MasterPageContainer::GetURLForToken ( MasterPageContainer::Token aToken) { @@ -437,9 +380,6 @@ OUString MasterPageContainer::GetURLForToken ( return OUString(); } - - - OUString MasterPageContainer::GetPageNameForToken ( MasterPageContainer::Token aToken) { @@ -452,9 +392,6 @@ OUString MasterPageContainer::GetPageNameForToken ( return OUString(); } - - - OUString MasterPageContainer::GetStyleNameForToken ( MasterPageContainer::Token aToken) { @@ -467,9 +404,6 @@ OUString MasterPageContainer::GetStyleNameForToken ( return OUString(); } - - - SdPage* MasterPageContainer::GetPageObjectForToken ( MasterPageContainer::Token aToken, bool bLoad) @@ -495,9 +429,6 @@ SdPage* MasterPageContainer::GetPageObjectForToken ( return pPageObject; } - - - MasterPageContainer::Origin MasterPageContainer::GetOriginForToken (Token aToken) { const ::osl::MutexGuard aGuard (mpImpl->maMutex); @@ -509,9 +440,6 @@ MasterPageContainer::Origin MasterPageContainer::GetOriginForToken (Token aToken return UNKNOWN; } - - - sal_Int32 MasterPageContainer::GetTemplateIndexForToken (Token aToken) { const ::osl::MutexGuard aGuard (mpImpl->maMutex); @@ -523,9 +451,6 @@ sal_Int32 MasterPageContainer::GetTemplateIndexForToken (Token aToken) return -1; } - - - SharedMasterPageDescriptor MasterPageContainer::GetDescriptorForToken ( MasterPageContainer::Token aToken) { @@ -534,40 +459,26 @@ SharedMasterPageDescriptor MasterPageContainer::GetDescriptorForToken ( return mpImpl->GetDescriptor(aToken); } - - void MasterPageContainer::InvalidatePreview (MasterPageContainer::Token aToken) { mpImpl->InvalidatePreview(aToken); } - - - Image MasterPageContainer::GetPreviewForToken (MasterPageContainer::Token aToken) { return mpImpl->GetPreviewForToken(aToken,mePreviewSize); } - - - MasterPageContainer::PreviewState MasterPageContainer::GetPreviewState (Token aToken) { return mpImpl->GetPreviewState(aToken); } - - - bool MasterPageContainer::RequestPreview (Token aToken) { return mpImpl->RequestPreview(aToken); } - - - //==== Implementation ================================================ MasterPageContainer::Implementation::Implementation (void) @@ -592,9 +503,6 @@ MasterPageContainer::Implementation::Implementation (void) UpdatePreviewSizePixel(); } - - - MasterPageContainer::Implementation::~Implementation (void) { // When the initializer or filler tasks are still running then we have @@ -617,9 +525,6 @@ MasterPageContainer::Implementation::~Implementation (void) mxModel = NULL; } - - - void MasterPageContainer::Implementation::LateInit (void) { const ::osl::MutexGuard aGuard (maMutex); @@ -641,9 +546,6 @@ void MasterPageContainer::Implementation::LateInit (void) } } - - - void MasterPageContainer::Implementation::AddChangeListener (const Link& rLink) { const ::osl::MutexGuard aGuard (maMutex); @@ -655,9 +557,6 @@ void MasterPageContainer::Implementation::AddChangeListener (const Link& rLink) } - - - void MasterPageContainer::Implementation::RemoveChangeListener (const Link& rLink) { const ::osl::MutexGuard aGuard (maMutex); @@ -668,9 +567,6 @@ void MasterPageContainer::Implementation::RemoveChangeListener (const Link& rLin maChangeListeners.erase(iListener); } - - - void MasterPageContainer::Implementation::UpdatePreviewSizePixel (void) { const ::osl::MutexGuard aGuard (maMutex); @@ -712,9 +608,6 @@ void MasterPageContainer::Implementation::UpdatePreviewSizePixel (void) } } - - - Size MasterPageContainer::Implementation::GetPreviewSizePixel (PreviewSize eSize) const { if (eSize == SMALL) @@ -723,9 +616,6 @@ Size MasterPageContainer::Implementation::GetPreviewSizePixel (PreviewSize eSize return maLargePreviewSizePixel; } - - - IMPL_LINK(MasterPageContainer::Implementation,AsynchronousNotifyCallback, EventData*, pData) { const ::osl::MutexGuard aGuard (maMutex); @@ -739,9 +629,6 @@ IMPL_LINK(MasterPageContainer::Implementation,AsynchronousNotifyCallback, EventD return 0; } - - - MasterPageContainer::Token MasterPageContainer::Implementation::PutMasterPage ( const SharedMasterPageDescriptor& rpDescriptor) { @@ -819,9 +706,6 @@ MasterPageContainer::Token MasterPageContainer::Implementation::PutMasterPage ( return aResult; } - - - bool MasterPageContainer::Implementation::HasToken (Token aToken) const { return aToken>=0 @@ -829,9 +713,6 @@ bool MasterPageContainer::Implementation::HasToken (Token aToken) const && maContainer[aToken].get()!=NULL; } - - - const SharedMasterPageDescriptor MasterPageContainer::Implementation::GetDescriptor ( Token aToken) const { @@ -841,9 +722,6 @@ const SharedMasterPageDescriptor MasterPageContainer::Implementation::GetDescrip return SharedMasterPageDescriptor(); } - - - SharedMasterPageDescriptor MasterPageContainer::Implementation::GetDescriptor (Token aToken) { if (aToken>=0 && (unsigned)aToken<maContainer.size()) @@ -852,9 +730,6 @@ SharedMasterPageDescriptor MasterPageContainer::Implementation::GetDescriptor (T return SharedMasterPageDescriptor(); } - - - void MasterPageContainer::Implementation::InvalidatePreview (Token aToken) { const ::osl::MutexGuard aGuard (maMutex); @@ -868,9 +743,6 @@ void MasterPageContainer::Implementation::InvalidatePreview (Token aToken) } } - - - Image MasterPageContainer::Implementation::GetPreviewForToken ( MasterPageContainer::Token aToken, PreviewSize ePreviewSize) @@ -924,9 +796,6 @@ Image MasterPageContainer::Implementation::GetPreviewForToken ( return aPreview; } - - - MasterPageContainer::PreviewState MasterPageContainer::Implementation::GetPreviewState ( Token aToken) const { @@ -955,9 +824,6 @@ MasterPageContainer::PreviewState MasterPageContainer::Implementation::GetPrevie return eState; } - - - bool MasterPageContainer::Implementation::RequestPreview (Token aToken) { SharedMasterPageDescriptor pDescriptor = GetDescriptor(aToken); @@ -967,9 +833,6 @@ bool MasterPageContainer::Implementation::RequestPreview (Token aToken) return false; } - - - Reference<frame::XModel> MasterPageContainer::Implementation::GetModel (void) { const ::osl::MutexGuard aGuard (maMutex); @@ -1022,18 +885,12 @@ Reference<frame::XModel> MasterPageContainer::Implementation::GetModel (void) return mxModel; } - - - SdDrawDocument* MasterPageContainer::Implementation::GetDocument (void) { GetModel(); return mpDocument; } - - - Image MasterPageContainer::Implementation::GetPreviewSubstitution ( sal_uInt16 nId, PreviewSize ePreviewSize) @@ -1078,9 +935,6 @@ Image MasterPageContainer::Implementation::GetPreviewSubstitution ( return aPreview; } - - - void MasterPageContainer::Implementation::CleanContainer (void) { // Remove the empty elements at the end of the container. The empty @@ -1092,9 +946,6 @@ void MasterPageContainer::Implementation::CleanContainer (void) maContainer.resize(++nIndex); } - - - void MasterPageContainer::Implementation::FireContainerChange ( MasterPageContainerChangeEvent::EventType eType, Token aToken, @@ -1118,9 +969,6 @@ void MasterPageContainer::Implementation::FireContainerChange ( } } - - - bool MasterPageContainer::Implementation::UpdateDescriptor ( const SharedMasterPageDescriptor& rpDescriptor, bool bForcePageObject, @@ -1172,9 +1020,6 @@ bool MasterPageContainer::Implementation::UpdateDescriptor ( return nPageObjectModified || bPreviewModified; } - - - void MasterPageContainer::Implementation::ReleaseDescriptor (Token aToken) { if (aToken>=0 && (unsigned)aToken<maContainer.size()) @@ -1184,16 +1029,11 @@ void MasterPageContainer::Implementation::ReleaseDescriptor (Token aToken) } } - - - void MasterPageContainer::Implementation::FillingDone (void) { mpRequestQueue->ProcessAllRequests(); } - - } } // end of namespace sd::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/sidebar/MasterPageContainer.hxx b/sd/source/ui/sidebar/MasterPageContainer.hxx index 692815a0b4ba..4ed2d90bb6d9 100644 --- a/sd/source/ui/sidebar/MasterPageContainer.hxx +++ b/sd/source/ui/sidebar/MasterPageContainer.hxx @@ -164,9 +164,6 @@ private: static BitmapEx LoadPreviewFromURL (const OUString& aURL); }; - - - /** For some changes to the set of master pages in a MasterPageContainer or to the data stored for each master page one or more events are sent to registered listeners. @@ -198,7 +195,6 @@ public: MasterPageContainer::Token maChildToken; }; - } } // end of namespace sd::sidebar #endif diff --git a/sd/source/ui/sidebar/MasterPageContainerFiller.cxx b/sd/source/ui/sidebar/MasterPageContainerFiller.cxx index a33c86d86195..49fba6dbfc06 100644 --- a/sd/source/ui/sidebar/MasterPageContainerFiller.cxx +++ b/sd/source/ui/sidebar/MasterPageContainerFiller.cxx @@ -26,7 +26,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; - namespace sd { namespace sidebar { MasterPageContainerFiller::MasterPageContainerFiller (ContainerAdapter& rpAdapter) @@ -52,16 +51,10 @@ MasterPageContainerFiller::MasterPageContainerFiller (ContainerAdapter& rpAdapte mrContainerAdapter.PutMasterPage(pDescriptor); } - - - MasterPageContainerFiller::~MasterPageContainerFiller (void) { } - - - void MasterPageContainerFiller::RunNextStep (void) { switch (meState) @@ -102,9 +95,6 @@ void MasterPageContainerFiller::RunNextStep (void) } } - - - bool MasterPageContainerFiller::HasNextStep (void) { switch (meState) @@ -118,9 +108,6 @@ bool MasterPageContainerFiller::HasNextStep (void) } } - - - MasterPageContainerFiller::State MasterPageContainerFiller::ScanTemplate (void) { State eState (ERROR); @@ -148,9 +135,6 @@ MasterPageContainerFiller::State MasterPageContainerFiller::ScanTemplate (void) return eState; } - - - MasterPageContainerFiller::State MasterPageContainerFiller::AddTemplate (void) { if (mpLastAddedEntry != NULL) @@ -182,8 +166,6 @@ MasterPageContainerFiller::State MasterPageContainerFiller::AddTemplate (void) return SCAN_TEMPLATE; } - - } } // end of namespace sd::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/sidebar/MasterPageContainerProviders.cxx b/sd/source/ui/sidebar/MasterPageContainerProviders.cxx index a4abeaeca3b4..c81f74aaeca7 100644 --- a/sd/source/ui/sidebar/MasterPageContainerProviders.cxx +++ b/sd/source/ui/sidebar/MasterPageContainerProviders.cxx @@ -38,16 +38,12 @@ using namespace ::com::sun::star::uno; namespace sd { namespace sidebar { - //===== PagePreviewProvider =================================================== PagePreviewProvider::PagePreviewProvider (void) { } - - - Image PagePreviewProvider::operator () ( int nWidth, SdPage* pPage, @@ -69,25 +65,16 @@ Image PagePreviewProvider::operator () ( return aPreview; } - - - int PagePreviewProvider::GetCostIndex (void) { return 5; } - - - bool PagePreviewProvider::NeedsPageObject (void) { return true; } - - - //===== TemplatePreviewProvider =============================================== TemplatePreviewProvider::TemplatePreviewProvider (const OUString& rsURL) @@ -95,9 +82,6 @@ TemplatePreviewProvider::TemplatePreviewProvider (const OUString& rsURL) { } - - - Image TemplatePreviewProvider::operator() ( int nWidth, SdPage* pPage, @@ -111,25 +95,16 @@ Image TemplatePreviewProvider::operator() ( return Image(ThumbnailView::readThumbnail(msURL)); } - - - int TemplatePreviewProvider::GetCostIndex (void) { return 10; } - - - bool TemplatePreviewProvider::NeedsPageObject (void) { return false; } - - - //===== TemplatePageObjectProvider ============================================= TemplatePageObjectProvider::TemplatePageObjectProvider (const OUString& rsURL) @@ -138,9 +113,6 @@ TemplatePageObjectProvider::TemplatePageObjectProvider (const OUString& rsURL) { } - - - SdPage* TemplatePageObjectProvider::operator() (SdDrawDocument* pContainerDocument) { // Unused parameters. @@ -177,9 +149,6 @@ SdPage* TemplatePageObjectProvider::operator() (SdDrawDocument* pContainerDocume return pPage; } - - - ::sd::DrawDocShell* TemplatePageObjectProvider::LoadDocument (const OUString& sFileName) { SfxApplication* pSfxApp = SFX_APP(); @@ -194,17 +163,11 @@ SdPage* TemplatePageObjectProvider::operator() (SdDrawDocument* pContainerDocume return PTR_CAST(::sd::DrawDocShell,pShell); } - - - int TemplatePageObjectProvider::GetCostIndex (void) { return 20; } - - - bool TemplatePageObjectProvider::operator== (const PageObjectProvider& rProvider) { const TemplatePageObjectProvider* pTemplatePageObjectProvider @@ -215,18 +178,12 @@ bool TemplatePageObjectProvider::operator== (const PageObjectProvider& rProvider return false; } - - - //===== DefaultPageObjectProvider ============================================== DefaultPageObjectProvider::DefaultPageObjectProvider (void) { } - - - SdPage* DefaultPageObjectProvider::operator () (SdDrawDocument* pContainerDocument) { SdPage* pLocalMasterPage = NULL; @@ -246,25 +203,16 @@ SdPage* DefaultPageObjectProvider::operator () (SdDrawDocument* pContainerDocume return pLocalMasterPage; } - - - int DefaultPageObjectProvider::GetCostIndex (void) { return 15; } - - - bool DefaultPageObjectProvider::operator== (const PageObjectProvider& rProvider) { return (dynamic_cast<const DefaultPageObjectProvider*>(&rProvider) != NULL); } - - - //===== ExistingPageProvider ================================================== ExistingPageProvider::ExistingPageProvider (SdPage* pPage) @@ -272,9 +220,6 @@ ExistingPageProvider::ExistingPageProvider (SdPage* pPage) { } - - - SdPage* ExistingPageProvider::operator() (SdDrawDocument* pDocument) { (void)pDocument; // Unused parameter. @@ -282,17 +227,11 @@ SdPage* ExistingPageProvider::operator() (SdDrawDocument* pDocument) return mpPage; } - - - int ExistingPageProvider::GetCostIndex (void) { return 0; } - - - bool ExistingPageProvider::operator== (const PageObjectProvider& rProvider) { const ExistingPageProvider* pExistingPageProvider @@ -303,7 +242,6 @@ bool ExistingPageProvider::operator== (const PageObjectProvider& rProvider) return false; } - } } // end of namespace sd::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/sidebar/MasterPageContainerProviders.hxx b/sd/source/ui/sidebar/MasterPageContainerProviders.hxx index aa4b91160ec4..7fc367ebe30b 100644 --- a/sd/source/ui/sidebar/MasterPageContainerProviders.hxx +++ b/sd/source/ui/sidebar/MasterPageContainerProviders.hxx @@ -29,10 +29,8 @@ class SdPage; namespace sd { class PreviewRenderer; } namespace sd { class DrawDocShell; } - namespace sd { namespace sidebar { - /** Interface for a provider of page objects. It is used by the MasterPageDescriptor to create master page objects on demand. */ @@ -62,9 +60,6 @@ protected: ~PageObjectProvider() {} }; - - - class PreviewProvider { public: @@ -99,9 +94,6 @@ protected: ~PreviewProvider() {} }; - - - /** Provide previews of existing page objects by rendering them. */ class PagePreviewProvider : public PreviewProvider @@ -115,9 +107,6 @@ public: private: }; - - - /** Provide master page objects for template documents for which only the URL is given. */ @@ -135,9 +124,6 @@ private: ::sd::DrawDocShell* LoadDocument (const OUString& sFileName); }; - - - /** Provide previews for template documents by loading the thumbnails from the documents. */ @@ -153,9 +139,6 @@ private: OUString msURL; }; - - - /** Create an empty default master page. */ class DefaultPageObjectProvider : public PageObjectProvider @@ -168,8 +151,6 @@ public: virtual bool operator== (const PageObjectProvider& rProvider) SAL_OVERRIDE; }; - - /** This implementation of the PageObjectProvider simply returns an already existing master page object. */ diff --git a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx index 36015378092f..6841211049b2 100644 --- a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx +++ b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx @@ -70,9 +70,6 @@ public: }; }; - - - //===== MasterPageContainerQueue::RequestQueue ================================ class MasterPageContainerQueue::RequestQueue @@ -82,9 +79,6 @@ public: RequestQueue (void) {} }; - - - //===== MasterPageContainerQueue ============================================== MasterPageContainerQueue* MasterPageContainerQueue::Create ( @@ -95,9 +89,6 @@ MasterPageContainerQueue* MasterPageContainerQueue::Create ( return pQueue; } - - - MasterPageContainerQueue::MasterPageContainerQueue ( const ::boost::weak_ptr<ContainerAdapter>& rpContainer) : mpWeakContainer(rpContainer), @@ -107,9 +98,6 @@ MasterPageContainerQueue::MasterPageContainerQueue ( { } - - - MasterPageContainerQueue::~MasterPageContainerQueue (void) { maDelayedPreviewCreationTimer.Stop(); @@ -117,9 +105,6 @@ MasterPageContainerQueue::~MasterPageContainerQueue (void) mpRequestQueue->erase(mpRequestQueue->begin()); } - - - void MasterPageContainerQueue::LateInit (void) { // Set up the timer for the delayed creation of preview bitmaps. @@ -128,9 +113,6 @@ void MasterPageContainerQueue::LateInit (void) maDelayedPreviewCreationTimer.SetTimeoutHdl(aLink); } - - - bool MasterPageContainerQueue::RequestPreview (const SharedMasterPageDescriptor& rpDescriptor) { bool bSuccess (false); @@ -164,9 +146,6 @@ bool MasterPageContainerQueue::RequestPreview (const SharedMasterPageDescriptor& return bSuccess; } - - - sal_Int32 MasterPageContainerQueue::CalculatePriority ( const SharedMasterPageDescriptor& rpDescriptor) const { @@ -197,9 +176,6 @@ sal_Int32 MasterPageContainerQueue::CalculatePriority ( return nPriority; } - - - IMPL_LINK(MasterPageContainerQueue, DelayedPreviewCreation, Timer*, pTimer) { bool bIsShowingFullScreenShow (false); @@ -263,9 +239,6 @@ IMPL_LINK(MasterPageContainerQueue, DelayedPreviewCreation, Timer*, pTimer) return 0; } - - - bool MasterPageContainerQueue::HasRequest (MasterPageContainer::Token aToken) const { RequestQueue::iterator iRequest (::std::find_if( @@ -275,17 +248,11 @@ bool MasterPageContainerQueue::HasRequest (MasterPageContainer::Token aToken) co return (iRequest != mpRequestQueue->end()); } - - - bool MasterPageContainerQueue::IsEmpty (void) const { return mpRequestQueue->empty(); } - - - void MasterPageContainerQueue::ProcessAllRequests (void) { snWaitForMoreRequestsCount = 0; @@ -293,7 +260,6 @@ void MasterPageContainerQueue::ProcessAllRequests (void) maDelayedPreviewCreationTimer.Start(); } - } } // end of namespace sd::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/sidebar/MasterPageContainerQueue.hxx b/sd/source/ui/sidebar/MasterPageContainerQueue.hxx index 5e3afbf208e0..f013acc7da9a 100644 --- a/sd/source/ui/sidebar/MasterPageContainerQueue.hxx +++ b/sd/source/ui/sidebar/MasterPageContainerQueue.hxx @@ -28,7 +28,6 @@ namespace sd { namespace sidebar { - /** The queue stores and processes all requests from a MasterPageContainer for the creation of previews. The order of request processing and its timing is controlled by a diff --git a/sd/source/ui/sidebar/MasterPageDescriptor.cxx b/sd/source/ui/sidebar/MasterPageDescriptor.cxx index 973e86485535..d4a18755d5b7 100644 --- a/sd/source/ui/sidebar/MasterPageDescriptor.cxx +++ b/sd/source/ui/sidebar/MasterPageDescriptor.cxx @@ -25,7 +25,6 @@ namespace sd { namespace sidebar { - //===== MasterPageDescriptor ================================================== MasterPageDescriptor::MasterPageDescriptor ( @@ -55,9 +54,6 @@ MasterPageDescriptor::MasterPageDescriptor ( { } - - - MasterPageDescriptor::MasterPageDescriptor (const MasterPageDescriptor& rDescriptor) : maToken(rDescriptor.maToken), meOrigin(rDescriptor.meOrigin), @@ -77,24 +73,15 @@ MasterPageDescriptor::MasterPageDescriptor (const MasterPageDescriptor& rDescrip { } - - - MasterPageDescriptor::~MasterPageDescriptor (void) { } - - - void MasterPageDescriptor::SetToken (MasterPageContainer::Token aToken) { maToken = aToken; } - - - Image MasterPageDescriptor::GetPreview (MasterPageContainer::PreviewSize eSize) const { if (eSize == MasterPageContainer::SMALL) @@ -103,8 +90,6 @@ Image MasterPageDescriptor::GetPreview (MasterPageContainer::PreviewSize eSize) return maLargePreview; } - - SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<std::vector<MasterPageContainerChangeEvent::EventType> > MasterPageDescriptor::Update ( @@ -174,8 +159,6 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH } SAL_WNODEPRECATED_DECLARATIONS_POP - - int MasterPageDescriptor::UpdatePageObject ( sal_Int32 nCostThreshold, SdDrawDocument* pDocument) @@ -229,9 +212,6 @@ int MasterPageDescriptor::UpdatePageObject ( return nModified; } - - - bool MasterPageDescriptor::UpdatePreview ( sal_Int32 nCostThreshold, const Size& rSmallSize, @@ -273,9 +253,6 @@ bool MasterPageDescriptor::UpdatePreview ( return bModified; } - - - MasterPageDescriptor::URLClassification MasterPageDescriptor::GetURLClassification (void) { if (meURLClassification == URLCLASS_UNDETERMINED) @@ -303,8 +280,6 @@ MasterPageDescriptor::URLClassification MasterPageDescriptor::GetURLClassificati return meURLClassification; } - - //===== URLComparator ========================================================= MasterPageDescriptor::URLComparator::URLComparator (const OUString& sURL) @@ -312,9 +287,6 @@ MasterPageDescriptor::URLComparator::URLComparator (const OUString& sURL) { } - - - bool MasterPageDescriptor::URLComparator::operator() ( const SharedMasterPageDescriptor& rDescriptor) { @@ -324,9 +296,6 @@ bool MasterPageDescriptor::URLComparator::operator() ( return rDescriptor->msURL.equals(msURL); } - - - // ===== StyleNameComparator ================================================== MasterPageDescriptor::StyleNameComparator::StyleNameComparator (const OUString& sStyleName) @@ -334,9 +303,6 @@ MasterPageDescriptor::StyleNameComparator::StyleNameComparator (const OUString& { } - - - bool MasterPageDescriptor::StyleNameComparator::operator() ( const SharedMasterPageDescriptor& rDescriptor) { @@ -346,9 +312,6 @@ bool MasterPageDescriptor::StyleNameComparator::operator() ( return rDescriptor->msStyleName.equals(msStyleName); } - - - //===== PageObjectComparator ================================================== MasterPageDescriptor::PageObjectComparator::PageObjectComparator (const SdPage* pPageObject) @@ -356,9 +319,6 @@ MasterPageDescriptor::PageObjectComparator::PageObjectComparator (const SdPage* { } - - - bool MasterPageDescriptor::PageObjectComparator::operator() ( const SharedMasterPageDescriptor& rDescriptor) { @@ -368,9 +328,6 @@ bool MasterPageDescriptor::PageObjectComparator::operator() ( return rDescriptor->mpMasterPage==mpMasterPage; } - - - //===== AllComparator ========================================================= MasterPageDescriptor::AllComparator::AllComparator(const SharedMasterPageDescriptor& rDescriptor) @@ -378,9 +335,6 @@ MasterPageDescriptor::AllComparator::AllComparator(const SharedMasterPageDescrip { } - - - bool MasterPageDescriptor::AllComparator::operator() (const SharedMasterPageDescriptor&rDescriptor) { if (rDescriptor.get() == NULL) @@ -409,7 +363,6 @@ bool MasterPageDescriptor::AllComparator::operator() (const SharedMasterPageDesc } } - } } // end of namespace sd::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/sidebar/MasterPageDescriptor.hxx b/sd/source/ui/sidebar/MasterPageDescriptor.hxx index 14468b1c990d..28a52ec7a54c 100644 --- a/sd/source/ui/sidebar/MasterPageDescriptor.hxx +++ b/sd/source/ui/sidebar/MasterPageDescriptor.hxx @@ -224,10 +224,8 @@ public: SharedMasterPageDescriptor mpDescriptor; }; - }; - } } // end of namespace sd::sidebar #endif diff --git a/sd/source/ui/sidebar/MasterPageObserver.cxx b/sd/source/ui/sidebar/MasterPageObserver.cxx index 65853925625b..38df5dd28fda 100644 --- a/sd/source/ui/sidebar/MasterPageObserver.cxx +++ b/sd/source/ui/sidebar/MasterPageObserver.cxx @@ -29,7 +29,6 @@ #include <osl/doublecheckedlocking.h> #include <osl/getglobalmutex.hxx> - namespace sd { class MasterPageObserver::Implementation @@ -91,8 +90,6 @@ private: MasterPageObserver* MasterPageObserver::Implementation::mpInstance = NULL; - - //===== MasterPageObserver ==================================================== MasterPageObserver& MasterPageObserver::Instance (void) @@ -120,55 +117,34 @@ MasterPageObserver& MasterPageObserver::Instance (void) return *Implementation::mpInstance; } - - - void MasterPageObserver::RegisterDocument (SdDrawDocument& rDocument) { mpImpl->RegisterDocument (rDocument); } - - - void MasterPageObserver::UnregisterDocument (SdDrawDocument& rDocument) { mpImpl->UnregisterDocument (rDocument); } - - - void MasterPageObserver::AddEventListener (const Link& rEventListener) { mpImpl->AddEventListener (rEventListener); } - - - void MasterPageObserver::RemoveEventListener (const Link& rEventListener) { mpImpl->RemoveEventListener (rEventListener); } - - - MasterPageObserver::MasterPageObserver (void) : mpImpl (new Implementation()) {} - - - MasterPageObserver::~MasterPageObserver (void) {} - - - //===== MasterPageObserver::Implementation ==================================== void MasterPageObserver::Implementation::RegisterDocument ( @@ -189,9 +165,6 @@ void MasterPageObserver::Implementation::RegisterDocument ( StartListening (rDocument); } - - - void MasterPageObserver::Implementation::UnregisterDocument ( SdDrawDocument& rDocument) { @@ -202,9 +175,6 @@ void MasterPageObserver::Implementation::UnregisterDocument ( maUsedMasterPages.erase(aMasterPageDescriptor); } - - - void MasterPageObserver::Implementation::AddEventListener ( const Link& rEventListener) { @@ -237,9 +207,6 @@ void MasterPageObserver::Implementation::AddEventListener ( } } - - - void MasterPageObserver::Implementation::RemoveEventListener ( const Link& rEventListener) { @@ -283,9 +250,6 @@ void MasterPageObserver::Implementation::Notify( } } - - - void MasterPageObserver::Implementation::AnalyzeUsedMasterPages ( SdDrawDocument& rDocument) { @@ -367,9 +331,6 @@ void MasterPageObserver::Implementation::AnalyzeUsedMasterPages ( } } - - - void MasterPageObserver::Implementation::SendEvent ( MasterPageObserverEvent& rEvent) { @@ -382,7 +343,6 @@ void MasterPageObserver::Implementation::SendEvent ( } } - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx index ded2f3a028a8..dbff168eca62 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx @@ -56,14 +56,10 @@ #include <svl/itempool.hxx> #include <sfx2/sidebar/Theme.hxx> - using namespace ::com::sun::star::text; - - namespace sd { namespace sidebar { - MasterPagesSelector::MasterPagesSelector ( ::Window* pParent, SdDrawDocument& rDocument, @@ -102,9 +98,6 @@ MasterPagesSelector::MasterPagesSelector ( mpContainer->AddChangeListener(aChangeListener); } - - - MasterPagesSelector::~MasterPagesSelector (void) { Clear(); @@ -114,16 +107,10 @@ MasterPagesSelector::~MasterPagesSelector (void) mpContainer->RemoveChangeListener(aChangeListener); } - - - void MasterPagesSelector::LateInit (void) { } - - - sal_Int32 MasterPagesSelector::GetPreferredWidth (sal_Int32 nHeight) { const ::osl::MutexGuard aGuard (maMutex); @@ -131,9 +118,6 @@ sal_Int32 MasterPagesSelector::GetPreferredWidth (sal_Int32 nHeight) return PreviewValueSet::GetPreferredWidth (nHeight); } - - - sal_Int32 MasterPagesSelector::GetPreferredHeight (sal_Int32 nWidth) { const ::osl::MutexGuard aGuard (maMutex); @@ -141,9 +125,6 @@ sal_Int32 MasterPagesSelector::GetPreferredHeight (sal_Int32 nWidth) return PreviewValueSet::GetPreferredHeight (nWidth); } - - - Size MasterPagesSelector::GetPreferredSize (void) { int nPreferredWidth = GetPreferredWidth( @@ -153,9 +134,6 @@ Size MasterPagesSelector::GetPreferredSize (void) } - - - void MasterPagesSelector::UpdateLocks (const ItemList& rItemList) { ItemList aNewLockList; @@ -183,9 +161,6 @@ void MasterPagesSelector::UpdateLocks (const ItemList& rItemList) maLockedMasterPages.swap(aNewLockList); } - - - void MasterPagesSelector::Fill (void) { ::std::auto_ptr<ItemList> pItemList (new ItemList()); @@ -196,17 +171,11 @@ void MasterPagesSelector::Fill (void) UpdateItemList(pItemList); } - - - ResId MasterPagesSelector::GetContextMenuResId (void) const { return SdResId(RID_TASKPANE_MASTERPAGESSELECTOR_POPUP); } - - - IMPL_LINK_NOARG(MasterPagesSelector, ClickHandler) { // We use the framework to assign the clicked-on master page because we @@ -217,9 +186,6 @@ IMPL_LINK_NOARG(MasterPagesSelector, ClickHandler) return 0; } - - - IMPL_LINK(MasterPagesSelector, RightClickHandler, MouseEvent*, pEvent) { // Here we only prepare the display of the context menu: the item under @@ -242,9 +208,6 @@ IMPL_LINK(MasterPagesSelector, RightClickHandler, MouseEvent*, pEvent) return 0; } - - - void MasterPagesSelector::Command (const CommandEvent& rEvent) { switch (rEvent.GetCommand()) @@ -285,9 +248,6 @@ void MasterPagesSelector::Command (const CommandEvent& rEvent) } } - - - void MasterPagesSelector::ProcessPopupMenu (Menu& rMenu) { // Disable some entries. @@ -297,9 +257,6 @@ void MasterPagesSelector::ProcessPopupMenu (Menu& rMenu) rMenu.EnableItem(SID_TP_SHOW_LARGE_PREVIEW, false); } - - - IMPL_LINK(MasterPagesSelector, OnMenuItemSelected, Menu*, pMenu) { if (pMenu == NULL) @@ -313,9 +270,6 @@ IMPL_LINK(MasterPagesSelector, OnMenuItemSelected, Menu*, pMenu) return 0; } - - - void MasterPagesSelector::ExecuteCommand (const sal_Int32 nCommandId) { switch (nCommandId) @@ -383,9 +337,6 @@ void MasterPagesSelector::ExecuteCommand (const sal_Int32 nCommandId) } } - - - IMPL_LINK(MasterPagesSelector, ContainerChangeListener, MasterPageContainerChangeEvent*, pEvent) { if (pEvent) @@ -393,9 +344,6 @@ IMPL_LINK(MasterPagesSelector, ContainerChangeListener, MasterPageContainerChang return 0; } - - - SdPage* MasterPagesSelector::GetSelectedMasterPage (void) { const ::osl::MutexGuard aGuard (maMutex); @@ -410,9 +358,6 @@ SdPage* MasterPagesSelector::GetSelectedMasterPage (void) return pMasterPage; } - - - /** Assemble a list of all slides of the document and pass it to AssignMasterPageToPageList(). */ @@ -443,9 +388,6 @@ void MasterPagesSelector::AssignMasterPageToAllSlides (SdPage* pMasterPage) AssignMasterPageToPageList(pMasterPage, pPageList); } - - - /** Assemble a list of the currently selected slides (selected in a visible slide sorter) and pass it to AssignMasterPageToPageList(). */ @@ -474,9 +416,6 @@ void MasterPagesSelector::AssignMasterPageToSelectedSlides ( pSlideSorter->SetPageSelection(pPageSelection); } - - - void MasterPagesSelector::AssignMasterPageToPageList ( SdPage* pMasterPage, const ::sd::slidesorter::SharedPageSelection& rPageList) @@ -484,9 +423,6 @@ void MasterPagesSelector::AssignMasterPageToPageList ( DocumentHelper::AssignMasterPageToPageList(mrDocument, pMasterPage, rPageList); } - - - void MasterPagesSelector::NotifyContainerChangeEvent (const MasterPageContainerChangeEvent& rEvent) { const ::osl::MutexGuard aGuard (maMutex); @@ -529,9 +465,6 @@ void MasterPagesSelector::NotifyContainerChangeEvent (const MasterPageContainerC } } - - - MasterPagesSelector::UserData* MasterPagesSelector::CreateUserData ( int nIndex, MasterPageContainer::Token aToken) const @@ -539,9 +472,6 @@ MasterPagesSelector::UserData* MasterPagesSelector::CreateUserData ( return new UserData(nIndex,aToken); } - - - MasterPagesSelector::UserData* MasterPagesSelector::GetUserData (int nIndex) const { const ::osl::MutexGuard aGuard (maMutex); @@ -552,9 +482,6 @@ MasterPagesSelector::UserData* MasterPagesSelector::GetUserData (int nIndex) con return NULL; } - - - void MasterPagesSelector::SetUserData (int nIndex, UserData* pData) { const ::osl::MutexGuard aGuard (maMutex); @@ -568,40 +495,25 @@ void MasterPagesSelector::SetUserData (int nIndex, UserData* pData) } } - - - bool MasterPagesSelector::IsResizable (void) { return false; } - - - ::Window* MasterPagesSelector::GetWindow (void) { return this; } - - - sal_Int32 MasterPagesSelector::GetMinimumWidth (void) { return mpContainer->GetPreviewSizePixel().Width() + 2*3; } - - - void MasterPagesSelector::UpdateSelection (void) { } - - - void MasterPagesSelector::SetItem ( sal_uInt16 nIndex, MasterPageContainer::Token aToken) @@ -648,9 +560,6 @@ void MasterPagesSelector::SetItem ( } - - - void MasterPagesSelector::AddTokenToIndexEntry ( sal_uInt16 nIndex, MasterPageContainer::Token aToken) @@ -660,9 +569,6 @@ void MasterPagesSelector::AddTokenToIndexEntry ( maTokenToValueSetIndex[aToken] = nIndex; } - - - void MasterPagesSelector::RemoveTokenToIndexEntry ( sal_uInt16 nIndex, MasterPageContainer::Token aNewToken) @@ -683,9 +589,6 @@ void MasterPagesSelector::RemoveTokenToIndexEntry ( } } - - - void MasterPagesSelector::InvalidatePreview (const SdPage* pPage) { const ::osl::MutexGuard aGuard (maMutex); @@ -726,9 +629,6 @@ void MasterPagesSelector::UpdateAllPreviews (void) PreviewValueSet::Rearrange(true); } - - - void MasterPagesSelector::ClearPageSet (void) { const ::osl::MutexGuard aGuard (maMutex); @@ -742,9 +642,6 @@ void MasterPagesSelector::ClearPageSet (void) PreviewValueSet::Clear(); } - - - void MasterPagesSelector::SetHelpId( const OString& aId ) { const ::osl::MutexGuard aGuard (maMutex); @@ -752,9 +649,6 @@ void MasterPagesSelector::SetHelpId( const OString& aId ) PreviewValueSet::SetHelpId( aId ); } - - - sal_Int32 MasterPagesSelector::GetIndexForToken (MasterPageContainer::Token aToken) const { const ::osl::MutexGuard aGuard (maMutex); @@ -766,9 +660,6 @@ sal_Int32 MasterPagesSelector::GetIndexForToken (MasterPageContainer::Token aTok return -1; } - - - void MasterPagesSelector::Clear (void) { const ::osl::MutexGuard aGuard (maMutex); @@ -776,9 +667,6 @@ void MasterPagesSelector::Clear (void) ClearPageSet(); } - - - void MasterPagesSelector::InvalidateItem (MasterPageContainer::Token aToken) { const ::osl::MutexGuard aGuard (maMutex); @@ -794,8 +682,6 @@ void MasterPagesSelector::InvalidateItem (MasterPageContainer::Token aToken) } } - - SAL_WNODEPRECATED_DECLARATIONS_PUSH void MasterPagesSelector::UpdateItemList (::std::auto_ptr<ItemList> pNewItemList) { @@ -836,8 +722,6 @@ void MasterPagesSelector::UpdateItemList (::std::auto_ptr<ItemList> pNewItemList } SAL_WNODEPRECATED_DECLARATIONS_POP - - css::ui::LayoutSize MasterPagesSelector::GetHeightForWidth (const sal_Int32 nWidth) { const sal_Int32 nHeight (GetPreferredHeight(nWidth)); diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx index c65b400e6154..04380bc070e5 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx @@ -49,7 +49,6 @@ namespace sd { namespace sidebar { class PreviewValueSet; - /** Base class of a menu that lets the user select from a list of templates or designs that are loaded from files. */ diff --git a/sd/source/ui/sidebar/NavigatorWrapper.cxx b/sd/source/ui/sidebar/NavigatorWrapper.cxx index 53689f467665..3df03cc05f88 100644 --- a/sd/source/ui/sidebar/NavigatorWrapper.cxx +++ b/sd/source/ui/sidebar/NavigatorWrapper.cxx @@ -25,7 +25,6 @@ #include <boost/bind.hpp> - namespace sd { namespace sidebar { NavigatorWrapper::NavigatorWrapper ( @@ -48,24 +47,15 @@ NavigatorWrapper::NavigatorWrapper ( maNavigator.Show(); } - - - NavigatorWrapper::~NavigatorWrapper (void) { } - - - void NavigatorWrapper::Resize (void) { maNavigator.SetSizePixel(GetSizePixel()); } - - - css::ui::LayoutSize NavigatorWrapper::GetHeightForWidth (const sal_Int32 nWidth) { (void)nWidth; @@ -73,24 +63,16 @@ css::ui::LayoutSize NavigatorWrapper::GetHeightForWidth (const sal_Int32 nWidth) return css::ui::LayoutSize(-1,-1,-1); } - - - void NavigatorWrapper::UpdateNavigator (void) { maNavigator.InitTreeLB(mrViewShellBase.GetDocument()); } - - - void NavigatorWrapper::GetFocus (void) { maNavigator.GrabFocus(); } - - } } // end of namespace sd::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/sidebar/NavigatorWrapper.hxx b/sd/source/ui/sidebar/NavigatorWrapper.hxx index d9bb14d33dd0..61445b1b984a 100644 --- a/sd/source/ui/sidebar/NavigatorWrapper.hxx +++ b/sd/source/ui/sidebar/NavigatorWrapper.hxx @@ -23,7 +23,6 @@ #include <vcl/ctrl.hxx> #include "navigatr.hxx" - class SfxBindings; namespace sd { class ViewShellBase; } @@ -62,7 +61,6 @@ private: void UpdateNavigator (void); }; - } } // end of namespace sd::sidebar #endif diff --git a/sd/source/ui/sidebar/PanelBase.cxx b/sd/source/ui/sidebar/PanelBase.cxx index fd6a7c1d413d..e1e368e31470 100644 --- a/sd/source/ui/sidebar/PanelBase.cxx +++ b/sd/source/ui/sidebar/PanelBase.cxx @@ -19,11 +19,8 @@ #include "TableDesignPanel.hxx" - - namespace sd { namespace sidebar { - PanelBase::PanelBase ( ::Window* pParentWindow, ViewShellBase& rViewShellBase) @@ -39,9 +36,6 @@ PanelBase::PanelBase ( #endif } - - - PanelBase::~PanelBase (void) { OSL_TRACE("deleting wrapped control at %p", mpWrappedControl.get()); @@ -49,19 +43,12 @@ PanelBase::~PanelBase (void) OSL_TRACE("deleting PanelBase at %p from parent %p", this, GetParent()); } - - - - void PanelBase::Dispose (void) { OSL_TRACE("PanelBase::DisposeL: deleting wrapped control at %p", mpWrappedControl.get()); mpWrappedControl.reset(); } - - - css::ui::LayoutSize PanelBase::GetHeightForWidth (const sal_Int32 /*nWidth*/) { sal_Int32 nHeight (0); @@ -70,9 +57,6 @@ css::ui::LayoutSize PanelBase::GetHeightForWidth (const sal_Int32 /*nWidth*/) return css::ui::LayoutSize(nHeight,nHeight,nHeight); } - - - void PanelBase::Resize (void) { if (ProvideWrappedControl()) @@ -82,9 +66,6 @@ void PanelBase::Resize (void) } } - - - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> PanelBase::CreateAccessibleObject ( const ::com::sun::star::uno::Reference< @@ -96,9 +77,6 @@ void PanelBase::Resize (void) return NULL; } - - - void PanelBase::SetSidebar (const cssu::Reference<css::ui::XSidebar>& rxSidebar) { mxSidebar = rxSidebar; @@ -106,9 +84,6 @@ void PanelBase::SetSidebar (const cssu::Reference<css::ui::XSidebar>& rxSidebar) mxSidebar->requestLayout(); } - - - bool PanelBase::ProvideWrappedControl (void) { if ( ! mpWrappedControl) diff --git a/sd/source/ui/sidebar/PanelBase.hxx b/sd/source/ui/sidebar/PanelBase.hxx index e3ea04032d37..b41f58110eab 100644 --- a/sd/source/ui/sidebar/PanelBase.hxx +++ b/sd/source/ui/sidebar/PanelBase.hxx @@ -33,12 +33,8 @@ namespace sd { class ViewShellBase; } - - - namespace sd { namespace sidebar { - class PanelBase : public Control, public sfx2::sidebar::ILayoutableWindow, diff --git a/sd/source/ui/sidebar/PanelFactory.cxx b/sd/source/ui/sidebar/PanelFactory.cxx index ec1f3d4929a4..678efe441e11 100644 --- a/sd/source/ui/sidebar/PanelFactory.cxx +++ b/sd/source/ui/sidebar/PanelFactory.cxx @@ -61,8 +61,6 @@ namespace { Reference<lang::XEventListener> mxControllerDisposeListener; - - // ----- Service functions ---------------------------------------------------- Reference<XInterface> SAL_CALL PanelFactory_createInstance ( @@ -71,17 +69,11 @@ Reference<XInterface> SAL_CALL PanelFactory_createInstance ( return Reference<XInterface>(static_cast<XWeak*>(new PanelFactory(rxContext))); } - - - ::rtl::OUString PanelFactory_getImplementationName (void) throw(RuntimeException) { return OUString("org.openoffice.comp.Draw.framework.PanelFactory"); } - - - Sequence<rtl::OUString> SAL_CALL PanelFactory_getSupportedServiceNames (void) throw (RuntimeException) { @@ -89,9 +81,6 @@ Sequence<rtl::OUString> SAL_CALL PanelFactory_getSupportedServiceNames (void) return Sequence<rtl::OUString>(&sServiceName, 1); } - - - //----- PanelFactory -------------------------------------------------------- PanelFactory::PanelFactory( @@ -100,23 +89,14 @@ PanelFactory::PanelFactory( { } - - - PanelFactory::~PanelFactory (void) { } - - - void SAL_CALL PanelFactory::disposing (void) { } - - - // XUIElementFactory Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement ( @@ -194,9 +174,6 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement ( aLayoutSize); } - - - } } // end of namespace sd::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/sidebar/PanelFactory.hxx b/sd/source/ui/sidebar/PanelFactory.hxx index 6d16b43f2af0..ae4f307b81b4 100644 --- a/sd/source/ui/sidebar/PanelFactory.hxx +++ b/sd/source/ui/sidebar/PanelFactory.hxx @@ -34,7 +34,6 @@ namespace cssu = ::com::sun::star::uno; - namespace sd { class ViewShellBase; } @@ -48,7 +47,6 @@ namespace > PanelFactoryInterfaceBase; } - class PanelFactory : private ::boost::noncopyable, private ::cppu::BaseMutex, @@ -65,7 +63,6 @@ public: virtual void SAL_CALL disposing (void) SAL_OVERRIDE; - // XUIElementFactory cssu::Reference<css::ui::XUIElement> SAL_CALL createUIElement ( @@ -77,7 +74,6 @@ public: cssu::RuntimeException, std::exception) SAL_OVERRIDE; }; - } } // end of namespace sd::sidebar #endif diff --git a/sd/source/ui/sidebar/PreviewValueSet.cxx b/sd/source/ui/sidebar/PreviewValueSet.cxx index ae3d7fbfbd5f..e532d7ace50f 100644 --- a/sd/source/ui/sidebar/PreviewValueSet.cxx +++ b/sd/source/ui/sidebar/PreviewValueSet.cxx @@ -20,10 +20,8 @@ #include "PreviewValueSet.hxx" #include <vcl/image.hxx> - namespace sd { namespace sidebar { - PreviewValueSet::PreviewValueSet (::Window* pParent) : ValueSet (pParent, WB_TABSTOP), maPreviewSize(10,10), @@ -40,32 +38,20 @@ PreviewValueSet::PreviewValueSet (::Window* pParent) SetExtraSpacing (2); } - - - PreviewValueSet::~PreviewValueSet (void) { } - - - void PreviewValueSet::SetPreviewSize (const Size& rSize) { maPreviewSize = rSize; } - - - void PreviewValueSet::SetRightMouseClickHandler (const Link& rLink) { maRightMouseClickHandler = rLink; } - - - void PreviewValueSet::MouseButtonDown (const MouseEvent& rEvent) { if (rEvent.IsRight()) @@ -76,9 +62,6 @@ void PreviewValueSet::MouseButtonDown (const MouseEvent& rEvent) } - - - void PreviewValueSet::Resize (void) { ValueSet::Resize (); @@ -90,9 +73,6 @@ void PreviewValueSet::Resize (void) } } - - - void PreviewValueSet::Rearrange (bool /*bForceRequestResize*/) { sal_uInt16 nNewColumnCount (CalculateColumnCount ( @@ -103,9 +83,6 @@ void PreviewValueSet::Rearrange (bool /*bForceRequestResize*/) SetLineCount(nNewRowCount); } - - - sal_uInt16 PreviewValueSet::CalculateColumnCount (int nWidth) const { int nColumnCount = 0; @@ -120,9 +97,6 @@ sal_uInt16 PreviewValueSet::CalculateColumnCount (int nWidth) const return (sal_uInt16)nColumnCount; } - - - sal_uInt16 PreviewValueSet::CalculateRowCount (sal_uInt16 nColumnCount) const { int nRowCount = 0; @@ -137,9 +111,6 @@ sal_uInt16 PreviewValueSet::CalculateRowCount (sal_uInt16 nColumnCount) const return (sal_uInt16)nRowCount; } - - - sal_Int32 PreviewValueSet::GetPreferredWidth (sal_Int32 nHeight) { int nPreferredWidth (maPreviewSize.Width() + 2*mnBorderWidth); @@ -161,9 +132,6 @@ sal_Int32 PreviewValueSet::GetPreferredWidth (sal_Int32 nHeight) return nPreferredWidth; } - - - sal_Int32 PreviewValueSet::GetPreferredHeight (sal_Int32 nWidth) { int nRowCount (CalculateRowCount(CalculateColumnCount(nWidth))); @@ -172,9 +140,6 @@ sal_Int32 PreviewValueSet::GetPreferredHeight (sal_Int32 nWidth) return nRowCount * (nItemHeight + 2*mnBorderHeight); } - - - } } // end of namespace sd::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/sidebar/PreviewValueSet.hxx b/sd/source/ui/sidebar/PreviewValueSet.hxx index bbaf21cb3e22..9bd390f7c18f 100644 --- a/sd/source/ui/sidebar/PreviewValueSet.hxx +++ b/sd/source/ui/sidebar/PreviewValueSet.hxx @@ -22,10 +22,8 @@ #include <svtools/valueset.hxx> - namespace sd { namespace sidebar { - /** Adapt the svtools valueset to the needs of the master page controls. */ class PreviewValueSet diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx index 0e1a423ea17f..0ebcff4c640e 100644 --- a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx @@ -32,7 +32,6 @@ namespace sd { namespace sidebar { - MasterPagesSelector* RecentMasterPagesSelector::Create ( ::Window* pParent, ViewShellBase& rViewShellBase, @@ -57,9 +56,6 @@ MasterPagesSelector* RecentMasterPagesSelector::Create ( return pSelector; } - - - RecentMasterPagesSelector::RecentMasterPagesSelector ( ::Window* pParent, SdDrawDocument& rDocument, @@ -70,18 +66,12 @@ RecentMasterPagesSelector::RecentMasterPagesSelector ( { } - - - RecentMasterPagesSelector::~RecentMasterPagesSelector (void) { RecentlyUsedMasterPages::Instance().RemoveEventListener ( LINK(this,RecentMasterPagesSelector,MasterPageListListener)); } - - - void RecentMasterPagesSelector::LateInit (void) { MasterPagesSelector::LateInit(); @@ -91,18 +81,12 @@ void RecentMasterPagesSelector::LateInit (void) LINK(this,RecentMasterPagesSelector,MasterPageListListener)); } - - - IMPL_LINK_NOARG(RecentMasterPagesSelector, MasterPageListListener) { MasterPagesSelector::Fill(); return 0; } - - - void RecentMasterPagesSelector::Fill (ItemList& rItemList) { // Create a set of names of the master pages used by the document. @@ -138,9 +122,6 @@ void RecentMasterPagesSelector::Fill (ItemList& rItemList) } } - - - void RecentMasterPagesSelector::AssignMasterPageToPageList ( SdPage* pMasterPage, const ::boost::shared_ptr<std::vector<SdPage*> >& rpPageList) @@ -159,18 +140,12 @@ void RecentMasterPagesSelector::AssignMasterPageToPageList ( } } - - - void RecentMasterPagesSelector::ProcessPopupMenu (Menu& rMenu) { if (rMenu.GetItemPos(SID_TP_EDIT_MASTER) != MENU_ITEM_NOTFOUND) rMenu.EnableItem(SID_TP_EDIT_MASTER, false); } - - - } } // end of namespace sd::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx b/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx index e751b2b8ed71..931663966f1d 100644 --- a/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx @@ -24,7 +24,6 @@ namespace sd { namespace sidebar { - /** Show the recently used master pages (that are not currently used). */ class RecentMasterPagesSelector diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx index 315c5f1fd024..1ce37806298f 100644 --- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx +++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx @@ -46,7 +46,6 @@ using namespace ::std; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; - namespace { static const OUString& GetPathToImpressConfigurationRoot (void) @@ -60,7 +59,6 @@ static const OUString& GetPathToSetNode (void) return sPathToSetNode; } - class Descriptor { public: @@ -85,9 +83,6 @@ public: } // end of anonymous namespace - - - namespace sd { namespace sidebar { class RecentlyUsedMasterPages::MasterPageList : public ::std::vector<Descriptor> @@ -96,10 +91,8 @@ public: MasterPageList (void) {} }; - RecentlyUsedMasterPages* RecentlyUsedMasterPages::mpInstance = NULL; - RecentlyUsedMasterPages& RecentlyUsedMasterPages::Instance (void) { if (mpInstance == NULL) @@ -123,9 +116,6 @@ RecentlyUsedMasterPages& RecentlyUsedMasterPages::Instance (void) return *mpInstance; } - - - RecentlyUsedMasterPages::RecentlyUsedMasterPages (void) : maListeners(), mpMasterPages(new MasterPageList()), @@ -134,9 +124,6 @@ RecentlyUsedMasterPages::RecentlyUsedMasterPages (void) { } - - - RecentlyUsedMasterPages::~RecentlyUsedMasterPages (void) { Link aLink (LINK(this,RecentlyUsedMasterPages,MasterPageContainerChangeListener)); @@ -146,9 +133,6 @@ RecentlyUsedMasterPages::~RecentlyUsedMasterPages (void) LINK(this,RecentlyUsedMasterPages,MasterPageChangeListener)); } - - - void RecentlyUsedMasterPages::LateInit (void) { Link aLink (LINK(this,RecentlyUsedMasterPages,MasterPageContainerChangeListener)); @@ -159,9 +143,6 @@ void RecentlyUsedMasterPages::LateInit (void) LINK(this,RecentlyUsedMasterPages,MasterPageChangeListener)); } - - - void RecentlyUsedMasterPages::LoadPersistentValues (void) { try @@ -227,9 +208,6 @@ void RecentlyUsedMasterPages::LoadPersistentValues (void) } } - - - void RecentlyUsedMasterPages::SavePersistentValues (void) { try @@ -289,9 +267,6 @@ void RecentlyUsedMasterPages::SavePersistentValues (void) } } - - - void RecentlyUsedMasterPages::AddEventListener (const Link& rEventListener) { if (::std::find ( @@ -303,9 +278,6 @@ void RecentlyUsedMasterPages::AddEventListener (const Link& rEventListener) } } - - - void RecentlyUsedMasterPages::RemoveEventListener (const Link& rEventListener) { maListeners.erase ( @@ -315,17 +287,11 @@ void RecentlyUsedMasterPages::RemoveEventListener (const Link& rEventListener) rEventListener)); } - - - int RecentlyUsedMasterPages::GetMasterPageCount (void) const { return mpMasterPages->size(); } - - - MasterPageContainer::Token RecentlyUsedMasterPages::GetTokenForIndex (sal_uInt32 nIndex) const { if(nIndex<mpMasterPages->size()) @@ -334,9 +300,6 @@ MasterPageContainer::Token RecentlyUsedMasterPages::GetTokenForIndex (sal_uInt32 return MasterPageContainer::NIL_TOKEN; } - - - void RecentlyUsedMasterPages::SendEvent (void) { ::std::vector<Link>::iterator aLink (maListeners.begin()); @@ -348,9 +311,6 @@ void RecentlyUsedMasterPages::SendEvent (void) } } - - - IMPL_LINK(RecentlyUsedMasterPages, MasterPageChangeListener, MasterPageObserverEvent*, pEvent) { @@ -372,9 +332,6 @@ IMPL_LINK(RecentlyUsedMasterPages, MasterPageChangeListener, return 0; } - - - IMPL_LINK(RecentlyUsedMasterPages, MasterPageContainerChangeListener, MasterPageContainerChangeEvent*, pEvent) { @@ -395,9 +352,6 @@ IMPL_LINK(RecentlyUsedMasterPages, MasterPageContainerChangeListener, return 0; } - - - void RecentlyUsedMasterPages::AddMasterPage ( MasterPageContainer::Token aToken, bool bMakePersistent) @@ -437,9 +391,6 @@ void RecentlyUsedMasterPages::AddMasterPage ( } } - - - void RecentlyUsedMasterPages::ResolveList (void) { bool bNotify (false); @@ -468,7 +419,6 @@ void RecentlyUsedMasterPages::ResolveList (void) SendEvent(); } - } } // end of namespace sd::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx index 1de71bfc5f50..8be36cb1239f 100644 --- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx +++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx @@ -34,7 +34,6 @@ namespace sd { class MasterPageObserverEvent; } - namespace sd { namespace sidebar { /** This singleton holds a list of the most recently used master pages. @@ -110,8 +109,6 @@ private: void ResolveList (void); }; - - } } // end of namespace sd::sidebar #endif diff --git a/sd/source/ui/sidebar/SlideTransitionPanel.cxx b/sd/source/ui/sidebar/SlideTransitionPanel.cxx index 30cbe1392207..04d47524f862 100644 --- a/sd/source/ui/sidebar/SlideTransitionPanel.cxx +++ b/sd/source/ui/sidebar/SlideTransitionPanel.cxx @@ -24,7 +24,6 @@ namespace sd { namespace sidebar { - SlideTransitionPanel::SlideTransitionPanel ( ::Window* pParentWindow, ViewShellBase& rViewShellBase, @@ -38,16 +37,10 @@ SlideTransitionPanel::SlideTransitionPanel ( #endif } - - - SlideTransitionPanel::~SlideTransitionPanel (void) { } - - - ::Window* SlideTransitionPanel::CreateWrappedControl ( ::Window* pParentWindow, ViewShellBase& rViewShellBase) @@ -55,9 +48,6 @@ SlideTransitionPanel::~SlideTransitionPanel (void) return createSlideTransitionPanel(pParentWindow, rViewShellBase, mxFrame); } - - - css::ui::LayoutSize SlideTransitionPanel::GetHeightForWidth (const sal_Int32 /*nWidth*/) { Window *pControl = mpWrappedControl.get(); diff --git a/sd/source/ui/sidebar/SlideTransitionPanel.hxx b/sd/source/ui/sidebar/SlideTransitionPanel.hxx index d2990b62e6de..251976ba7c63 100644 --- a/sd/source/ui/sidebar/SlideTransitionPanel.hxx +++ b/sd/source/ui/sidebar/SlideTransitionPanel.hxx @@ -48,7 +48,6 @@ private: } } // end of namespace sd::sidebar - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/sidebar/TableDesignPanel.cxx b/sd/source/ui/sidebar/TableDesignPanel.cxx index dd9a1333a514..61212dd7db17 100644 --- a/sd/source/ui/sidebar/TableDesignPanel.cxx +++ b/sd/source/ui/sidebar/TableDesignPanel.cxx @@ -24,7 +24,6 @@ namespace sd { namespace sidebar { - TableDesignPanel::TableDesignPanel ( ::Window* pParentWindow, ViewShellBase& rViewShellBase) @@ -35,16 +34,10 @@ TableDesignPanel::TableDesignPanel ( #endif } - - - TableDesignPanel::~TableDesignPanel (void) { } - - - ::Window* TableDesignPanel::CreateWrappedControl ( ::Window* pParentWindow, ViewShellBase& rViewShellBase) @@ -52,9 +45,6 @@ TableDesignPanel::~TableDesignPanel (void) return createTableDesignPanel(pParentWindow, rViewShellBase); } - - - css::ui::LayoutSize TableDesignPanel::GetHeightForWidth (const sal_Int32 /*nWidth*/) { Window *pControl = mpWrappedControl.get(); diff --git a/sd/source/ui/slideshow/PaneHider.cxx b/sd/source/ui/slideshow/PaneHider.cxx index c87f7532279d..7fb399ef13a0 100644 --- a/sd/source/ui/slideshow/PaneHider.cxx +++ b/sd/source/ui/slideshow/PaneHider.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "PaneHider.hxx" #include "ViewShell.hxx" @@ -81,9 +80,6 @@ PaneHider::PaneHider (const ViewShell& rViewShell, SlideshowImpl* pSlideShow) } } - - - PaneHider::~PaneHider (void) { if (mxConfiguration.is() && mxConfigurationController.is()) @@ -100,7 +96,6 @@ PaneHider::~PaneHider (void) } } - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slideshow/PaneHider.hxx b/sd/source/ui/slideshow/PaneHider.hxx index 097f8cabfe86..bfdda992f7a1 100644 --- a/sd/source/ui/slideshow/PaneHider.hxx +++ b/sd/source/ui/slideshow/PaneHider.hxx @@ -23,7 +23,6 @@ #include <com/sun/star/drawing/framework/XConfiguration.hpp> #include <com/sun/star/drawing/framework/XConfigurationController.hpp> - namespace sd { class ViewShell; diff --git a/sd/source/ui/slideshow/SlideShowRestarter.cxx b/sd/source/ui/slideshow/SlideShowRestarter.cxx index f9dcacf0a7e4..7f72a3c0ce6d 100644 --- a/sd/source/ui/slideshow/SlideShowRestarter.cxx +++ b/sd/source/ui/slideshow/SlideShowRestarter.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "DrawController.hxx" #include "SlideShowRestarter.hxx" #include "framework/ConfigurationController.hxx" @@ -34,7 +33,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using ::sd::framework::FrameworkHelper; - namespace sd { SlideShowRestarter::SlideShowRestarter ( diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index 00ffb1204cf0..f24e6a153e85 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/awt/Key.hpp> #include "showwindow.hxx" @@ -25,7 +24,6 @@ #include <unotools/syslocale.hxx> #include <sfx2/viewfrm.hxx> - #include "res_bmp.hrc" #include "slideshow.hxx" #include "ViewShellBase.hxx" @@ -43,8 +41,6 @@ namespace sd { static const sal_uLong HIDE_MOUSE_TIMEOUT = 10000; static const sal_uLong SHOW_MOUSE_TIMEOUT = 1000; - - ShowWindow::ShowWindow( const ::rtl::Reference< SlideshowImpl >& xController, ::Window* pParent ) : ::sd::Window( pParent ) , mnPauseTimeout( SLIDE_NO_TIMEOUT ) @@ -87,7 +83,6 @@ ShowWindow::~ShowWindow(void) maMouseTimer.Stop(); } - void ShowWindow::KeyInput(const KeyEvent& rKEvt) { bool bReturn = false; @@ -170,7 +165,6 @@ void ShowWindow::KeyInput(const KeyEvent& rKEvt) mpViewShell->SetActiveWindow( this ); } - void ShowWindow::MouseButtonDown(const MouseEvent& /*rMEvt*/) { if( SHOWWINDOWMODE_PREVIEW == meShowWindowMode ) @@ -183,7 +177,6 @@ void ShowWindow::MouseButtonDown(const MouseEvent& /*rMEvt*/) } } - void ShowWindow::MouseMove(const MouseEvent& /*rMEvt*/) { if( mbMouseAutoHide ) @@ -225,7 +218,6 @@ void ShowWindow::MouseMove(const MouseEvent& /*rMEvt*/) mpViewShell->SetActiveWindow( this ); } - void ShowWindow::MouseButtonUp(const MouseEvent& rMEvt) { if( SHOWWINDOWMODE_PREVIEW == meShowWindowMode ) @@ -289,8 +281,6 @@ void ShowWindow::GetFocus() Window::GetFocus(); } - - void ShowWindow::LoseFocus() { Window::LoseFocus(); @@ -299,22 +289,16 @@ void ShowWindow::LoseFocus() TerminateShow(); } - - void ShowWindow::Resize() { ::sd::Window::Resize(); } - - void ShowWindow::Move() { ::sd::Window::Move(); } - - bool ShowWindow::SetEndMode() { if( ( SHOWWINDOWMODE_NORMAL == meShowWindowMode ) && mpViewShell && mpViewShell->GetView() ) @@ -336,8 +320,6 @@ bool ShowWindow::SetEndMode() return( SHOWWINDOWMODE_END == meShowWindowMode ); } - - bool ShowWindow::SetPauseMode( sal_Int32 nPageIndexToRestart, sal_Int32 nTimeout, Graphic* pLogo ) { rtl::Reference< SlideShow > xSlideShow; @@ -376,8 +358,6 @@ bool ShowWindow::SetPauseMode( sal_Int32 nPageIndexToRestart, sal_Int32 nTimeout return( SHOWWINDOWMODE_PAUSE == meShowWindowMode ); } - - bool ShowWindow::SetBlankMode( sal_Int32 nPageIndexToRestart, const Color& rBlankColor ) { if( ( SHOWWINDOWMODE_NORMAL == meShowWindowMode ) && mpViewShell && mpViewShell->GetView() ) @@ -400,15 +380,11 @@ bool ShowWindow::SetBlankMode( sal_Int32 nPageIndexToRestart, const Color& rBlan return( SHOWWINDOWMODE_BLANK == meShowWindowMode ); } - - void ShowWindow::SetPreviewMode() { meShowWindowMode = SHOWWINDOWMODE_PREVIEW; } - - void ShowWindow::TerminateShow() { maLogo.Clear(); @@ -435,15 +411,11 @@ void ShowWindow::TerminateShow() mnRestartPageIndex = PAGE_NO_END; } - - void ShowWindow::RestartShow() { RestartShow( mnRestartPageIndex ); } - - void ShowWindow::RestartShow( sal_Int32 nPageIndexToRestart ) { @@ -487,8 +459,6 @@ void ShowWindow::RestartShow( sal_Int32 nPageIndexToRestart ) } } - - void ShowWindow::DrawPauseScene( bool bTimeoutOnly ) { const MapMode& rMap = GetMapMode(); @@ -562,8 +532,6 @@ void ShowWindow::DrawPauseScene( bool bTimeoutOnly ) } } - - void ShowWindow::DrawEndScene() { const Font aOldFont( GetFont() ); @@ -582,15 +550,11 @@ void ShowWindow::DrawEndScene() SetFont( aOldFont ); } - - void ShowWindow::DrawBlankScene() { // just blank through background color => nothing to be done here } - - IMPL_LINK( ShowWindow, PauseTimeoutHdl, Timer*, pTimer ) { if( !( --mnPauseTimeout ) ) diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 36453062f051..57be255a37ff 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <com/sun/star/container/XIndexAccess.hpp> @@ -70,7 +69,6 @@ using namespace ::com::sun::star::drawing::framework; extern OUString getUiNameFromPageApiNameImpl( const OUString& rApiName ); - namespace { /** This local version of the work window overloads DataChanged() so that it can restart the slide show when a display is added or removed. @@ -101,10 +99,6 @@ namespace { }; } - - - - const SfxItemPropertyMapEntry* ImplGetPresentationPropertyMap() { // NOTE: First member must be sorted @@ -131,10 +125,8 @@ const SfxItemPropertyMapEntry* ImplGetPresentationPropertyMap() return aPresentationPropertyMap_Impl; } - // class SlideShow - SlideShow::SlideShow( SdDrawDocument* pDoc ) : SlideshowBase( m_aMutex ) , maPropSet(ImplGetPresentationPropertyMap(), SdrObject::GetGlobalDrawObjectItemPool()) @@ -159,8 +151,6 @@ rtl::Reference< SlideShow > SlideShow::Create( SdDrawDocument* pDoc ) return new SlideShow( pDoc ); } - - rtl::Reference< SlideShow > SlideShow::GetSlideShow( SdDrawDocument* pDocument ) { rtl::Reference< SlideShow > xRet; @@ -171,23 +161,17 @@ rtl::Reference< SlideShow > SlideShow::GetSlideShow( SdDrawDocument* pDocument ) return xRet; } - - rtl::Reference< SlideShow > SlideShow::GetSlideShow( SdDrawDocument& rDocument ) { return rtl::Reference< SlideShow >( dynamic_cast< SlideShow* >( rDocument.getPresentation().get() ) ); } - - rtl::Reference< SlideShow > SlideShow::GetSlideShow( ViewShellBase& rBase ) { return GetSlideShow( rBase.GetDocument() ); } - - ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XSlideShowController > SlideShow::GetSlideShowController(ViewShellBase& rBase ) { rtl::Reference< SlideShow > xSlideShow( GetSlideShow( rBase ) ); @@ -199,8 +183,6 @@ rtl::Reference< SlideShow > SlideShow::GetSlideShow( ViewShellBase& rBase ) return xRet; } - - bool SlideShow::StartPreview( ViewShellBase& rBase, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xAnimationNode, @@ -213,8 +195,6 @@ bool SlideShow::StartPreview( ViewShellBase& rBase, return false; } - - void SlideShow::Stop( ViewShellBase& rBase ) { rtl::Reference< SlideShow > xSlideShow( GetSlideShow( rBase ) ); @@ -222,24 +202,18 @@ void SlideShow::Stop( ViewShellBase& rBase ) xSlideShow->end(); } - - bool SlideShow::IsRunning( ViewShellBase& rBase ) { rtl::Reference< SlideShow > xSlideShow( GetSlideShow( rBase ) ); return xSlideShow.is() && xSlideShow->isRunning(); } - - bool SlideShow::IsRunning( ViewShell& rViewShell ) { rtl::Reference< SlideShow > xSlideShow( GetSlideShow( rViewShell.GetViewShellBase() ) ); return xSlideShow.is() && xSlideShow->isRunning() && (xSlideShow->mxController->getViewShell() == &rViewShell); } - - void SlideShow::CreateController( ViewShell* pViewSh, ::sd::View* pView, ::Window* pParentWindow ) { DBG_ASSERT( !mxController.is(), "sd::SlideShow::CreateController(), clean up old controller first!" ); @@ -558,8 +532,6 @@ void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const mpDoc->SetChanged( true ); } - - Any SAL_CALL SlideShow::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -626,42 +598,30 @@ Any SAL_CALL SlideShow::getPropertyValue( const OUString& PropertyName ) throw(U } } - - void SAL_CALL SlideShow::addPropertyChangeListener( const OUString& , const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } - - void SAL_CALL SlideShow::removePropertyChangeListener( const OUString& , const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } - - void SAL_CALL SlideShow::addVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } - - void SAL_CALL SlideShow::removeVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } - // XPresentation - void SAL_CALL SlideShow::start() throw(RuntimeException, std::exception) { const Sequence< PropertyValue > aArguments; startWithArguments( aArguments ); } - - WorkWindow *SlideShow::GetWorkWindow() { if( !mpFullScreenViewShellBase ) @@ -832,8 +792,6 @@ void SAL_CALL SlideShow::end() } } - - void SAL_CALL SlideShow::rehearseTimings() throw(RuntimeException, std::exception) { Sequence< PropertyValue > aArguments(1); @@ -842,10 +800,8 @@ void SAL_CALL SlideShow::rehearseTimings() throw(RuntimeException, std::exceptio startWithArguments( aArguments ); } - // XPresentation2 - void SAL_CALL SlideShow::startWithArguments(const Sequence< PropertyValue >& rArguments) throw (RuntimeException, std::exception) { @@ -908,16 +864,12 @@ void SAL_CALL SlideShow::startWithArguments(const Sequence< PropertyValue >& rAr } - - sal_Bool SAL_CALL SlideShow::isRunning( ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; return mxController.is() && mxController->isRunning(); } - - Reference< XSlideShowController > SAL_CALL SlideShow::getController( ) throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -926,10 +878,8 @@ Reference< XSlideShowController > SAL_CALL SlideShow::getController( ) throw (R return xController; } - // XComponent - void SAL_CALL SlideShow::disposing (void) { SolarMutexGuard aGuard; @@ -951,8 +901,6 @@ void SAL_CALL SlideShow::disposing (void) mpDoc = 0; } - - bool SlideShow::startPreview( const Reference< XDrawPage >& xDrawPage, const Reference< XAnimationNode >& xAnimationNode, ::Window* pParent ) { Sequence< PropertyValue > aArguments(4); @@ -978,68 +926,50 @@ bool SlideShow::startPreview( const Reference< XDrawPage >& xDrawPage, const Ref return true; } - - ShowWindow* SlideShow::getShowWindow() { return mxController.is() ? mxController->mpShowWindow : 0; } - - int SlideShow::getAnimationMode() { return mxController.is() ? mxController->meAnimationMode : ANIMATIONMODE_SHOW; } - - void SlideShow::jumpToPageIndex( sal_Int32 nPageIndex ) { if( mxController.is() ) mxController->displaySlideIndex( nPageIndex ); } - - void SlideShow::jumpToPageNumber( sal_Int32 nPageNumber ) { if( mxController.is() ) mxController->displaySlideNumber( nPageNumber ); } - - sal_Int32 SlideShow::getCurrentPageNumber() { return mxController.is() ? mxController->getCurrentSlideNumber() : 0; } - - void SlideShow::jumpToBookmark( const OUString& sBookmark ) { if( mxController.is() ) mxController->jumpToBookmark( sBookmark ); } - - bool SlideShow::isFullScreen() { return mxController.is() && mxController->maPresSettings.mbFullScreen; } - - void SlideShow::resize( const Size &rSize ) { if( mxController.is() ) mxController->resize( rSize ); } - - void SlideShow::activate( ViewShellBase& rBase ) { if( (mpFullScreenViewShellBase == &rBase) && !mxController.is() ) @@ -1071,37 +1001,27 @@ void SlideShow::activate( ViewShellBase& rBase ) } - - void SlideShow::deactivate( ViewShellBase& /*rBase*/ ) { mxController->deactivate(); } - - bool SlideShow::keyInput(const KeyEvent& rKEvt) { return mxController.is() && mxController->keyInput(rKEvt); } - - void SlideShow::paint( const Rectangle& rRect ) { if( mxController.is() ) mxController->paint( rRect ); } - - bool SlideShow::isAlwaysOnTop() { return mxController.is() && mxController->maPresSettings.mbAlwaysOnTop; } - - bool SlideShow::pause( bool bPause ) { if( mxController.is() ) @@ -1114,44 +1034,32 @@ bool SlideShow::pause( bool bPause ) return true; } - - void SlideShow::receiveRequest(SfxRequest& rReq) { if( mxController.is() ) mxController->receiveRequest( rReq ); } - - sal_Int32 SlideShow::getFirstPageNumber() { return mxController.is() ? mxController->getFirstSlideNumber() : 0; } - - sal_Int32 SlideShow::getLastPageNumber() { return mxController.is() ? mxController->getLastSlideNumber() : 0; } - - bool SlideShow::isEndless() { return mxController.is() && mxController->isEndless(); } - - bool SlideShow::isDrawingPossible() { return mxController.is() && mxController->getUsePen(); } - - void SlideShow::StartInPlacePresentationConfigurationCallback() { if( mnInPlaceConfigEvent != 0 ) @@ -1160,8 +1068,6 @@ void SlideShow::StartInPlacePresentationConfigurationCallback() mnInPlaceConfigEvent = Application::PostUserEvent( LINK( this, SlideShow, StartInPlacePresentationConfigurationHdl ) ); } - - IMPL_LINK_NOARG(SlideShow, StartInPlacePresentationConfigurationHdl) { mnInPlaceConfigEvent = 0; @@ -1169,8 +1075,6 @@ IMPL_LINK_NOARG(SlideShow, StartInPlacePresentationConfigurationHdl) return 0; } - - void SlideShow::StartInPlacePresentation() { if( mpCurrentViewShellBase ) @@ -1240,8 +1144,6 @@ void SlideShow::StartInPlacePresentation() } } - - void SlideShow::StartFullscreenPresentation( ) { // Create the top level window in which the PresentationViewShell(Base) @@ -1284,8 +1186,6 @@ void SlideShow::StartFullscreenPresentation( ) } } - - /// convert configuration setting display concept to real screens sal_Int32 SlideShow::GetDisplay() { @@ -1307,21 +1207,14 @@ sal_Int32 SlideShow::GetDisplay() return nDisplay; } - - - bool SlideShow::dependsOn( ViewShellBase* pViewShellBase ) { return mxController.is() && (pViewShellBase == mpCurrentViewShellBase) && mpFullScreenViewShellBase; } - - Reference< presentation::XPresentation2 > CreatePresentation( const SdDrawDocument& rDocument ) { return Reference< presentation::XPresentation2 >( SlideShow::Create( const_cast< SdDrawDocument* >( &rDocument ) ).get() ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 1341953d74e1..aeaf2121b707 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -113,7 +113,6 @@ static sal_uInt16 const pAllowed[] = SID_NAVIGATOR_OBJECT // 27293 }; - class AnimationSlideController { public: @@ -195,7 +194,6 @@ bool AnimationSlideController::isVisibleSlideNumber( sal_Int32 nSlideNumber ) co return false; } - void AnimationSlideController::setPreviewNode( const Reference< XAnimationNode >& xPreviewNode ) { mxPreviewNode = xPreviewNode; @@ -398,7 +396,6 @@ sal_Int32 AnimationSlideController::getNextSlideNumber() const } } - bool AnimationSlideController::nextSlide() { return jumpToSlideIndex( getNextSlideIndex() ); @@ -492,10 +489,6 @@ void AnimationSlideController::displayCurrentSlide( const Reference< XSlideShow } } - - - - SlideshowImpl::SlideshowImpl( const Reference< XPresentation2 >& xPresentation, ViewShell* pViewSh, ::sd::View* pView, SdDrawDocument* pDoc, ::Window* pParentWindow ) : SlideshowImplBase( m_aMutex ) , mxModel(pDoc->getUnoModel(),UNO_QUERY_THROW) @@ -908,8 +901,6 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings ) mbRehearseTimings = pPresSettings->mbRehearseTimings; } - - OUString aPresSlide( maPresSettings.maPresPage ); SdPage* pStartPage = mpViewShell->GetActualPage(); bool bStartWithActualSlide = pStartPage; @@ -1167,7 +1158,6 @@ bool SlideshowImpl::startShowImpl( const Sequence< beans::PropertyValue >& aProp mxListenerProxy.set( new SlideShowListenerProxy( this, mxShow ) ); mxListenerProxy->addAsSlideShowListener(); - NotifyDocumentEvent( mpDoc, "OnStartPresentation"); displaySlideIndex( mpSlideController->getStartSlideIndex() ); @@ -1222,24 +1212,18 @@ void SlideshowImpl::paint( const Rectangle& /* rRect */ ) } } - - void SAL_CALL SlideshowImpl::addSlideShowListener( const Reference< XSlideShowListener >& xListener ) throw (RuntimeException, std::exception) { if( mxListenerProxy.is() ) mxListenerProxy->addSlideShowListener( xListener ); } - - void SAL_CALL SlideshowImpl::removeSlideShowListener( const Reference< XSlideShowListener >& xListener ) throw (RuntimeException, std::exception) { if( mxListenerProxy.is() ) mxListenerProxy->removeSlideShowListener( xListener ); } - - void SlideshowImpl::slideEnded(const bool bReverse) { if (bReverse) @@ -1248,8 +1232,6 @@ void SlideshowImpl::slideEnded(const bool bReverse) gotoNextSlide(); } - - void SlideshowImpl::removeShapeEvents() { if( mxShow.is() && mxListenerProxy.is() ) try @@ -1276,8 +1258,6 @@ void SlideshowImpl::removeShapeEvents() } } - - void SlideshowImpl::registerShapeEvents(sal_Int32 nSlideNumber) { if( nSlideNumber >= 0 ) try @@ -1311,8 +1291,6 @@ void SlideshowImpl::registerShapeEvents(sal_Int32 nSlideNumber) } } - - void SlideshowImpl::registerShapeEvents( Reference< XShapes >& xShapes ) throw( Exception ) { try @@ -1389,8 +1367,6 @@ void SlideshowImpl::registerShapeEvents( Reference< XShapes >& xShapes ) throw( } } - - void SlideshowImpl::displayCurrentSlide (const bool bSkipAllMainSequenceEffects) { stopSound(); @@ -1420,8 +1396,6 @@ void SlideshowImpl::displayCurrentSlide (const bool bSkipAllMainSequenceEffects) } } - - void SlideshowImpl::endPresentation() { if( maPresSettings.mbMouseAsPen) @@ -1435,8 +1409,6 @@ void SlideshowImpl::endPresentation() mnEndShowEvent = Application::PostUserEvent( LINK(this, SlideshowImpl, endPresentationHdl) ); } - - IMPL_LINK_NOARG(SlideshowImpl, endPresentationHdl) { mnEndShowEvent = 0; @@ -1446,8 +1418,6 @@ IMPL_LINK_NOARG(SlideshowImpl, endPresentationHdl) return 0; } - - void SAL_CALL SlideshowImpl::pause() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -1474,8 +1444,6 @@ void SAL_CALL SlideshowImpl::pause() throw (RuntimeException, std::exception) } } - - void SAL_CALL SlideshowImpl::resume() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -1513,16 +1481,12 @@ void SAL_CALL SlideshowImpl::resume() throw (RuntimeException, std::exception) #endif } - - sal_Bool SAL_CALL SlideshowImpl::isPaused() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; return mbIsPaused; } - - void SAL_CALL SlideshowImpl::blankScreen( sal_Int32 nColor ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -1536,10 +1500,8 @@ void SAL_CALL SlideshowImpl::blankScreen( sal_Int32 nColor ) throw (RuntimeExcep } } - // XShapeEventListener - void SlideshowImpl::click( const Reference< XShape >& xShape, const ::com::sun::star::awt::MouseEvent& /* aOriginalEvent */ ) { SolarMutexGuard aSolarGuard; @@ -1658,8 +1620,6 @@ void SlideshowImpl::click( const Reference< XShape >& xShape, const ::com::sun:: } } - - sal_Int32 SlideshowImpl::getSlideNumberForBookmark( const OUString& rStrBookmark ) { bool bIsMasterPage; @@ -1684,8 +1644,6 @@ sal_Int32 SlideshowImpl::getSlideNumberForBookmark( const OUString& rStrBookmark return ( nPgNum - 1) >> 1; } - - void SlideshowImpl::hyperLinkClicked( OUString const& aHyperLink ) throw (RuntimeException) { OUString aBookmark( aHyperLink ); @@ -1702,8 +1660,6 @@ void SlideshowImpl::hyperLinkClicked( OUString const& aHyperLink ) throw (Runtim mpDocSh->OpenBookmark( aBookmark ); } - - void SlideshowImpl::displaySlideNumber( sal_Int32 nSlideNumber ) { if( mpSlideController.get() ) @@ -1715,8 +1671,6 @@ void SlideshowImpl::displaySlideNumber( sal_Int32 nSlideNumber ) } } - - /** nSlideIndex == -1 displays current slide again */ void SlideshowImpl::displaySlideIndex( sal_Int32 nSlideIndex ) { @@ -1729,8 +1683,6 @@ void SlideshowImpl::displaySlideIndex( sal_Int32 nSlideIndex ) } } - - void SlideshowImpl::jumpToBookmark( const OUString& sBookmark ) { sal_Int32 nSlideNumber = getSlideNumberForBookmark( sBookmark ); @@ -1738,15 +1690,11 @@ void SlideshowImpl::jumpToBookmark( const OUString& sBookmark ) displaySlideNumber( nSlideNumber ); } - - sal_Int32 SlideshowImpl::getCurrentSlideNumber() { return mpSlideController.get() ? mpSlideController->getCurrentSlideNumber() : -1; } - - sal_Int32 SlideshowImpl::getFirstSlideNumber() { sal_Int32 nRet = 0; @@ -1768,8 +1716,6 @@ sal_Int32 SlideshowImpl::getFirstSlideNumber() return nRet; } - - sal_Int32 SlideshowImpl::getLastSlideNumber() { sal_Int32 nRet = 0; @@ -1791,24 +1737,18 @@ sal_Int32 SlideshowImpl::getLastSlideNumber() return nRet; } - - sal_Bool SAL_CALL SlideshowImpl::isEndless() throw( RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; return maPresSettings.mbEndless; } - - double SlideshowImpl::update() { startUpdateTimer(); return -1; } - - void SlideshowImpl::startUpdateTimer() { SolarMutexGuard aSolarGuard; @@ -1816,8 +1756,6 @@ void SlideshowImpl::startUpdateTimer() maUpdateTimer.Start(); } - - /** this timer is called 20ms after a new slide was displayed. This is used to unfreeze user input that was disabled after slide change to skip input that was buffered during slide @@ -1828,8 +1766,6 @@ IMPL_LINK_NOARG(SlideshowImpl, ReadyForNextInputHdl) return 0; } - - /** if I catch someone someday who calls this method by hand and not by using the timer, I will personaly punish this person seriously, even if this person is me. @@ -1839,9 +1775,6 @@ IMPL_LINK_NOARG(SlideshowImpl, updateHdl) return updateSlideShow(); } - - - IMPL_LINK_NOARG(SlideshowImpl, PostYieldListener) { // prevent me from deletion when recursing (App::Reschedule does) @@ -1858,9 +1791,6 @@ IMPL_LINK_NOARG(SlideshowImpl, PostYieldListener) return updateSlideShow(); } - - - sal_Int32 SlideshowImpl::updateSlideShow (void) { // prevent me from deletion when recursing (App::EnableYieldMode does) @@ -1929,8 +1859,6 @@ sal_Int32 SlideshowImpl::updateSlideShow (void) return 0; } - - bool SlideshowImpl::keyInput(const KeyEvent& rKEvt) { if( !mxShow.is() || mbInputFreeze ) @@ -2136,8 +2064,6 @@ IMPL_LINK( SlideshowImpl, EventListenerHdl, VclSimpleEvent*, pEvent ) return 0; } - - void SlideshowImpl::mouseButtonUp(const MouseEvent& rMEvt) { if( rMEvt.IsRight() && !mnContextMenuEvent ) @@ -2147,8 +2073,6 @@ void SlideshowImpl::mouseButtonUp(const MouseEvent& rMEvt) } } - - IMPL_LINK_NOARG(SlideshowImpl, ContextMenuHdl) { mnContextMenuEvent = 0; @@ -2283,8 +2207,6 @@ IMPL_LINK_NOARG(SlideshowImpl, ContextMenuHdl) return 0; } - - IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu ) { if( pMenu ) @@ -2439,8 +2361,6 @@ IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu ) return 0; } - - Reference< XSlideShow > SlideshowImpl::createSlideShow() const { Reference< XSlideShow > xShow; @@ -2465,8 +2385,6 @@ Reference< XSlideShow > SlideshowImpl::createSlideShow() const return xShow; } - - void SlideshowImpl::createSlideList( bool bAll, const OUString& rPresSlide ) { const long nSlideCount = mpDoc->GetSdPageCount( PK_STANDARD ); @@ -2493,7 +2411,6 @@ void SlideshowImpl::createSlideList( bool bAll, const OUString& rPresSlide ) { sal_Int32 nFirstVisibleSlide = 0; - // normal presentation if( !rPresSlide.isEmpty() ) { @@ -2555,8 +2472,6 @@ void SlideshowImpl::createSlideList( bool bAll, const OUString& rPresSlide ) } } - - typedef sal_uInt16 (*FncGetChildWindowId)(); FncGetChildWindowId aShowChildren[] = @@ -2603,8 +2518,6 @@ void SlideshowImpl::hideChildWindows() } } - - void SlideshowImpl::showChildWindows() { if( ANIMATIONMODE_SHOW == meAnimationMode ) @@ -2623,29 +2536,21 @@ void SlideshowImpl::showChildWindows() } } - - SfxViewFrame* SlideshowImpl::getViewFrame() const { return mpViewShell ? mpViewShell->GetViewFrame() : 0; } - - SfxDispatcher* SlideshowImpl::getDispatcher() const { return (mpViewShell && mpViewShell->GetViewFrame()) ? mpViewShell->GetViewFrame()->GetDispatcher() : 0; } - - SfxBindings* SlideshowImpl::getBindings() const { return (mpViewShell && mpViewShell->GetViewFrame()) ? &mpViewShell->GetViewFrame()->GetBindings() : 0; } - - void SlideshowImpl::resize( const Size& rSize ) { maPresSize = rSize; @@ -2672,8 +2577,6 @@ void SlideshowImpl::resize( const Size& rSize ) } } - - void SlideshowImpl::setActiveXToolbarsVisible( bool bVisible ) { // in case of ActiveX control the toolbars should not be visible if slide show runs in window mode @@ -2706,8 +2609,6 @@ void SlideshowImpl::setActiveXToolbarsVisible( bool bVisible ) } } - - void SAL_CALL SlideshowImpl::activate() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -2747,8 +2648,6 @@ void SAL_CALL SlideshowImpl::activate() throw (RuntimeException, std::exception) } } - - void SAL_CALL SlideshowImpl::deactivate() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -2759,8 +2658,6 @@ void SAL_CALL SlideshowImpl::deactivate() throw (RuntimeException, std::exceptio } } - - IMPL_LINK_NOARG(SlideshowImpl, deactivateHdl) { if( mbActive && mxShow.is() ) @@ -2783,16 +2680,12 @@ IMPL_LINK_NOARG(SlideshowImpl, deactivateHdl) return 0; } - - sal_Bool SAL_CALL SlideshowImpl::isActive() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; return mbActive; } - - void SlideshowImpl::receiveRequest(SfxRequest& rReq) { const SfxItemSet* pArgs = rReq.GetArgs(); @@ -2845,8 +2738,6 @@ void SlideshowImpl::receiveRequest(SfxRequest& rReq) } } - - void SlideshowImpl::setAutoSaveState( bool bOn) { try @@ -2871,8 +2762,6 @@ void SlideshowImpl::setAutoSaveState( bool bOn) } } - - Reference< XDrawPage > SAL_CALL SlideshowImpl::getCurrentSlide() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -2888,8 +2777,6 @@ Reference< XDrawPage > SAL_CALL SlideshowImpl::getCurrentSlide() throw (RuntimeE return xSlide; } - - sal_Int32 SAL_CALL SlideshowImpl::getNextSlideIndex() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -2904,24 +2791,18 @@ sal_Int32 SAL_CALL SlideshowImpl::getNextSlideIndex() throw (RuntimeException, s } } - - sal_Int32 SAL_CALL SlideshowImpl::getCurrentSlideIndex() throw (RuntimeException, std::exception) { return mpSlideController.get() ? mpSlideController->getCurrentSlideIndex() : -1; } - // ::com::sun::star::presentation::XSlideShowController: - ::sal_Int32 SAL_CALL SlideshowImpl::getSlideCount() throw (RuntimeException, std::exception) { return mpSlideController.get() ? mpSlideController->getSlideIndexCount() : 0; } - - Reference< XDrawPage > SAL_CALL SlideshowImpl::getSlideByIndex(::sal_Int32 Index) throw (RuntimeException, css::lang::IndexOutOfBoundsException, std::exception) { if( (mpSlideController.get() == 0 ) || (Index < 0) || (Index >= mpSlideController->getSlideIndexCount() ) ) @@ -2936,8 +2817,6 @@ sal_Bool SAL_CALL SlideshowImpl::getAlwaysOnTop() throw (RuntimeException, std:: return maPresSettings.mbAlwaysOnTop; } - - void SAL_CALL SlideshowImpl::setAlwaysOnTop( sal_Bool bAlways ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -2948,24 +2827,18 @@ void SAL_CALL SlideshowImpl::setAlwaysOnTop( sal_Bool bAlways ) throw (RuntimeEx } } - - sal_Bool SAL_CALL SlideshowImpl::isFullScreen() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; return maPresSettings.mbFullScreen; } - - sal_Bool SAL_CALL SlideshowImpl::getMouseVisible() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; return maPresSettings.mbMouseVisible; } - - void SAL_CALL SlideshowImpl::setMouseVisible( sal_Bool bVisible ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -2977,16 +2850,12 @@ void SAL_CALL SlideshowImpl::setMouseVisible( sal_Bool bVisible ) throw (Runtime } } - - sal_Bool SAL_CALL SlideshowImpl::getUsePen() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; return mbUsePen; } - - void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -3028,16 +2897,12 @@ void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen ) throw (RuntimeExc } } - - double SAL_CALL SlideshowImpl::getPenWidth() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; return mdUserPaintStrokeWidth; } - - void SAL_CALL SlideshowImpl::setPenWidth( double dStrokeWidth ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -3045,16 +2910,12 @@ void SAL_CALL SlideshowImpl::setPenWidth( double dStrokeWidth ) throw (RuntimeEx setUsePen( true ); // enable pen mode, update color and width } - - sal_Int32 SAL_CALL SlideshowImpl::getPenColor() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; return mnUserPaintColor; } - - void SAL_CALL SlideshowImpl::setPenColor( sal_Int32 nColor ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -3062,14 +2923,10 @@ void SAL_CALL SlideshowImpl::setPenColor( sal_Int32 nColor ) throw (RuntimeExcep setUsePen( true ); // enable pen mode, update color } - - void SAL_CALL SlideshowImpl::setUseEraser( sal_Bool /*_usepen*/ ) throw (css::uno::RuntimeException) { } - - void SAL_CALL SlideshowImpl::setPenMode( bool bSwitchPenMode ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -3077,7 +2934,6 @@ void SAL_CALL SlideshowImpl::setPenMode( bool bSwitchPenMode ) throw (RuntimeExc } - void SAL_CALL SlideshowImpl::setPointerMode( bool bSwitchPointerMode ) throw (css::uno::RuntimeException) { SolarMutexGuard aSolarGuard; @@ -3096,7 +2952,6 @@ void SAL_CALL SlideshowImpl::setPointerMode( bool bSwitchPointerMode ) throw (cs } } - void SAL_CALL SlideshowImpl::setPointerPosition( const ::com::sun::star::geometry::RealPoint2D& pos ) throw (css::uno::RuntimeException) { SolarMutexGuard aSolarGuard; @@ -3115,7 +2970,6 @@ void SAL_CALL SlideshowImpl::setPointerPosition( const ::com::sun::star::geometr } } - void SAL_CALL SlideshowImpl::setEraseAllInk(bool bEraseAllInk) throw (RuntimeException) { if( bEraseAllInk ) @@ -3144,18 +2998,14 @@ void SAL_CALL SlideshowImpl::setEraserMode( bool /*bSwitchEraserMode*/ ) throw ( { } - // XSlideShowController Methods - sal_Bool SAL_CALL SlideshowImpl::isRunning( ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; return mxShow.is(); } - - void SAL_CALL SlideshowImpl::gotoNextEffect( ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -3182,8 +3032,6 @@ void SAL_CALL SlideshowImpl::gotoNextEffect( ) throw (RuntimeException, std::ex } } - - void SAL_CALL SlideshowImpl::gotoPreviousEffect( ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -3206,8 +3054,6 @@ void SAL_CALL SlideshowImpl::gotoPreviousEffect( ) throw (RuntimeException, std } } - - void SAL_CALL SlideshowImpl::gotoFirstSlide( ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -3229,8 +3075,6 @@ void SAL_CALL SlideshowImpl::gotoFirstSlide( ) throw (RuntimeException, std::ex } } - - void SAL_CALL SlideshowImpl::gotoNextSlide( ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -3302,8 +3146,6 @@ void SAL_CALL SlideshowImpl::gotoNextSlide( ) throw (RuntimeException, std::exc } } - - void SAL_CALL SlideshowImpl::gotoPreviousSlide( ) throw (RuntimeException, std::exception) { gotoPreviousSlide(false); @@ -3358,8 +3200,6 @@ void SlideshowImpl::gotoPreviousSlide (const bool bSkipAllMainSequenceEffects) } } - - void SAL_CALL SlideshowImpl::gotoLastSlide() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -3384,8 +3224,6 @@ void SAL_CALL SlideshowImpl::gotoLastSlide() throw (RuntimeException, std::excep } } - - void SAL_CALL SlideshowImpl::gotoBookmark( const OUString& rBookmark ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -3398,8 +3236,6 @@ void SAL_CALL SlideshowImpl::gotoBookmark( const OUString& rBookmark ) throw (Ru displaySlideNumber( nSlideNumber ); } - - void SAL_CALL SlideshowImpl::gotoSlide( const Reference< XDrawPage >& xSlide ) throw(IllegalArgumentException, RuntimeException, std::exception) { @@ -3421,8 +3257,6 @@ void SAL_CALL SlideshowImpl::gotoSlide( const Reference< XDrawPage >& xSlide ) } } - - void SAL_CALL SlideshowImpl::gotoSlideIndex( sal_Int32 nIndex ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -3433,8 +3267,6 @@ void SAL_CALL SlideshowImpl::gotoSlideIndex( sal_Int32 nIndex ) throw (RuntimeEx displaySlideIndex( nIndex ); } - - void SAL_CALL SlideshowImpl::stopSound( ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -3458,46 +3290,33 @@ void SAL_CALL SlideshowImpl::stopSound( ) throw (RuntimeException, std::excepti } } - // XIndexAccess - ::sal_Int32 SAL_CALL SlideshowImpl::getCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return getSlideCount(); } - - ::com::sun::star::uno::Any SAL_CALL SlideshowImpl::getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { return Any( getSlideByIndex( Index ) ); } - - ::com::sun::star::uno::Type SAL_CALL SlideshowImpl::getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return cppu::UnoType<XDrawPage>::get(); } - - sal_Bool SAL_CALL SlideshowImpl::hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return getSlideCount() != 0; } - - Reference< XSlideShow > SAL_CALL SlideshowImpl::getSlideShow() throw (RuntimeException, std::exception) { return mxShow; } - - - PresentationSettingsEx::PresentationSettingsEx( const PresentationSettingsEx& r ) : PresentationSettings( r ) , mbRehearseTimings(r.mbRehearseTimings) @@ -3620,12 +3439,8 @@ void PresentationSettingsEx::SetPropertyValue( const OUString& rProperty, const throw IllegalArgumentException(); } - - - // XAnimationListener - SlideShowListenerProxy::SlideShowListenerProxy( const rtl::Reference< SlideshowImpl >& xController, const css::uno::Reference< css::presentation::XSlideShow >& xSlideShow ) : maListeners( m_aMutex ) , mxController( xController ) @@ -3633,14 +3448,10 @@ SlideShowListenerProxy::SlideShowListenerProxy( const rtl::Reference< SlideshowI { } - - SlideShowListenerProxy::~SlideShowListenerProxy() { } - - void SlideShowListenerProxy::addAsSlideShowListener() { if( mxSlideShow.is() ) @@ -3650,8 +3461,6 @@ void SlideShowListenerProxy::addAsSlideShowListener() } } - - void SlideShowListenerProxy::removeAsSlideShowListener() { if( mxSlideShow.is() ) @@ -3661,8 +3470,6 @@ void SlideShowListenerProxy::removeAsSlideShowListener() } } - - void SlideShowListenerProxy::addShapeEventListener( const css::uno::Reference< css::drawing::XShape >& xShape ) { if( mxSlideShow.is() ) @@ -3672,8 +3479,6 @@ void SlideShowListenerProxy::addShapeEventListener( const css::uno::Reference< c } } - - void SlideShowListenerProxy::removeShapeEventListener( const css::uno::Reference< css::drawing::XShape >& xShape ) { if( mxSlideShow.is() ) @@ -3683,22 +3488,16 @@ void SlideShowListenerProxy::removeShapeEventListener( const css::uno::Reference } } - - void SlideShowListenerProxy::addSlideShowListener( const css::uno::Reference< css::presentation::XSlideShowListener >& xListener ) { maListeners.addInterface(xListener); } - - void SlideShowListenerProxy::removeSlideShowListener( const css::uno::Reference< css::presentation::XSlideShowListener >& xListener ) { maListeners.removeInterface(xListener); } - - void SAL_CALL SlideShowListenerProxy::beginEvent( const Reference< XAnimationNode >& xNode ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3707,8 +3506,6 @@ void SAL_CALL SlideShowListenerProxy::beginEvent( const Reference< XAnimationNod maListeners.forEach<XSlideShowListener>( boost::bind( &XAnimationListener::beginEvent, _1, boost::cref(xNode) )); } - - void SAL_CALL SlideShowListenerProxy::endEvent( const Reference< XAnimationNode >& xNode ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3717,8 +3514,6 @@ void SAL_CALL SlideShowListenerProxy::endEvent( const Reference< XAnimationNode maListeners.forEach<XSlideShowListener>( boost::bind( &XAnimationListener::endEvent, _1, boost::cref(xNode) )); } - - void SAL_CALL SlideShowListenerProxy::repeat( const Reference< XAnimationNode >& xNode, ::sal_Int32 nRepeat ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3727,10 +3522,8 @@ void SAL_CALL SlideShowListenerProxy::repeat( const Reference< XAnimationNode >& maListeners.forEach<XSlideShowListener>( boost::bind( &XAnimationListener::repeat, _1, boost::cref(xNode), boost::cref(nRepeat) )); } - // ::com::sun::star::presentation::XSlideShowListener: - void SAL_CALL SlideShowListenerProxy::paused( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3739,8 +3532,6 @@ void SAL_CALL SlideShowListenerProxy::paused( ) throw (::com::sun::star::uno::R maListeners.forEach<XSlideShowListener>( boost::mem_fn( &XSlideShowListener::paused ) ); } - - void SAL_CALL SlideShowListenerProxy::resumed( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3749,8 +3540,6 @@ void SAL_CALL SlideShowListenerProxy::resumed( ) throw (::com::sun::star::uno:: maListeners.forEach<XSlideShowListener>( boost::mem_fn( &XSlideShowListener::resumed ) ); } - - void SAL_CALL SlideShowListenerProxy::slideTransitionStarted( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3759,8 +3548,6 @@ void SAL_CALL SlideShowListenerProxy::slideTransitionStarted( ) throw (RuntimeEx maListeners.forEach<XSlideShowListener>( boost::mem_fn( &XSlideShowListener::slideTransitionStarted ) ); } - - void SAL_CALL SlideShowListenerProxy::slideTransitionEnded( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3769,8 +3556,6 @@ void SAL_CALL SlideShowListenerProxy::slideTransitionEnded( ) throw (::com::sun: maListeners.forEach<XSlideShowListener>( boost::mem_fn( &XSlideShowListener::slideTransitionEnded ) ); } - - void SAL_CALL SlideShowListenerProxy::slideAnimationsEnded( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3779,8 +3564,6 @@ void SAL_CALL SlideShowListenerProxy::slideAnimationsEnded( ) throw (::com::sun maListeners.forEach<XSlideShowListener>( boost::mem_fn( &XSlideShowListener::slideAnimationsEnded ) ); } - - void SlideShowListenerProxy::slideEnded(sal_Bool bReverse) throw (RuntimeException, std::exception) { { @@ -3798,8 +3581,6 @@ void SlideShowListenerProxy::slideEnded(sal_Bool bReverse) throw (RuntimeExcepti } } - - void SlideShowListenerProxy::hyperLinkClicked( OUString const& aHyperLink ) throw (RuntimeException, std::exception) { { @@ -3816,10 +3597,8 @@ void SlideShowListenerProxy::hyperLinkClicked( OUString const& aHyperLink ) thro } } - // XEventListener - void SAL_CALL SlideShowListenerProxy::disposing( const ::com::sun::star::lang::EventObject& aDisposeEvent ) throw (RuntimeException, std::exception) { maListeners.disposeAndClear( aDisposeEvent ); @@ -3827,10 +3606,8 @@ void SAL_CALL SlideShowListenerProxy::disposing( const ::com::sun::star::lang::E mxSlideShow.clear(); } - // XShapeEventListener - void SAL_CALL SlideShowListenerProxy::click( const Reference< XShape >& xShape, const ::com::sun::star::awt::MouseEvent& aOriginalEvent ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index 8d54e5dec4b5..7514fdf51def 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -87,8 +87,6 @@ class SlideShowView; class AnimationSlideController; class PaneHider; - - struct PresentationSettingsEx : public PresentationSettings { bool mbRehearseTimings; @@ -105,8 +103,6 @@ struct PresentationSettingsEx : public PresentationSettings void SetPropertyValue( const OUString& rProperty, const css::uno::Any& rValue ) throw (css::lang::IllegalArgumentException); }; - - struct WrappedShapeEventImpl { css::presentation::ClickAction meClickAction; @@ -118,8 +114,6 @@ struct WrappedShapeEventImpl typedef boost::shared_ptr< WrappedShapeEventImpl > WrappedShapeEventImplPtr; typedef std::map< css::uno::Reference< css::drawing::XShape >, WrappedShapeEventImplPtr > WrappedShapeEventImplMap; - - class SlideShowListenerProxy : private ::cppu::BaseMutex, public ::cppu::WeakImplHelper2< css::presentation::XSlideShowListener, css::presentation::XShapeEventListener > { @@ -162,8 +156,6 @@ public: css::uno::Reference< css::presentation::XSlideShow > mxSlideShow; }; - - typedef ::cppu::WeakComponentImplHelper2< css::presentation::XSlideShowController, css::container::XIndexAccess > SlideshowImplBase; class SlideshowImpl : private ::cppu::BaseMutex, public SlideshowImplBase diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx index 30096f43d90c..093c920c7e23 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.cxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx @@ -31,7 +31,6 @@ #include <cppcanvas/vclfactory.hxx> #include <cppcanvas/basegfxfactory.hxx> - using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::uno::XInterface; using ::com::sun::star::uno::Reference; @@ -49,7 +48,6 @@ using namespace ::com::sun::star; namespace sd { - // SlideShowViewListeners SlideShowViewListeners::SlideShowViewListeners( ::osl::Mutex& rMutex ) : mrMutex( rMutex ) @@ -111,7 +109,6 @@ void SlideShowViewListeners::disposing( const lang::EventObject& _rEventSource ) maListeners.clear(); } - // SlideShowViewPaintListeners SlideShowViewPaintListeners::SlideShowViewPaintListeners( ::osl::Mutex& rMutex ) : SlideShowViewPaintListeners_Base( rMutex ) @@ -125,7 +122,6 @@ bool SlideShowViewPaintListeners::implTypedNotify( const Reference< awt::XPaintL return true; // continue calling listeners } - // SlideShowViewMouseListeners SlideShowViewMouseListeners::SlideShowViewMouseListeners( ::osl::Mutex& rMutex ) : SlideShowViewMouseListeners_Base( rMutex ) @@ -157,7 +153,6 @@ bool SlideShowViewMouseListeners::implTypedNotify( const Reference< awt::XMouseL return true; // continue calling listeners } - // SlideShowViewMouseMotionListeners SlideShowViewMouseMotionListeners::SlideShowViewMouseMotionListeners( ::osl::Mutex& rMutex ) : SlideShowViewMouseMotionListeners_Base( rMutex ) @@ -181,7 +176,6 @@ bool SlideShowViewMouseMotionListeners::implTypedNotify( const Reference< awt::X return true; // continue calling listeners } - // SlideShowView SlideShowView::SlideShowView( ShowWindow& rOutputWindow, SdDrawDocument* pDoc, @@ -304,7 +298,6 @@ void SAL_CALL SlideShowView::clear() throw (::com::sun::star::uno::RuntimeExcept // fill the bounds rectangle in black - const Size aWindowSize( mrOutputWindow.GetSizePixel() ); ::basegfx::B2DPolygon aPoly( ::basegfx::tools::createPolygonFromRect( diff --git a/sd/source/ui/slideshow/slideshowviewimpl.hxx b/sd/source/ui/slideshow/slideshowviewimpl.hxx index fb01e7e19135..0bfd22ce9228 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.hxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.hxx @@ -97,7 +97,6 @@ struct WrappedMouseMotionEvent : public ::com::sun::star::lang::EventObject ::com::sun::star::awt::MouseEvent maEvent; }; - // SlideShowViewListeners typedef std::vector< ::com::sun::star::uno::WeakReference< ::com::sun::star::util::XModifyListener > > ViewListenerVector; class SlideShowViewListeners @@ -117,7 +116,6 @@ protected: typedef ::std::auto_ptr< SlideShowViewListeners > SlideShowViewListenersPtr; - // SlideShowViewPaintListeners typedef ::comphelper::OListenerContainerBase< ::com::sun::star::awt::XPaintListener, ::com::sun::star::awt::PaintEvent > SlideShowViewPaintListeners_Base; @@ -132,7 +130,6 @@ protected: }; typedef ::std::auto_ptr< SlideShowViewPaintListeners > SlideShowViewPaintListenersPtr; - // SlideShowViewMouseListeners typedef ::comphelper::OListenerContainerBase< ::com::sun::star::awt::XMouseListener, WrappedMouseEvent > SlideShowViewMouseListeners_Base; @@ -148,8 +145,6 @@ protected: typedef ::std::auto_ptr< SlideShowViewMouseListeners > SlideShowViewMouseListenersPtr; - - // SlideShowViewMouseMotionListeners typedef ::comphelper::OListenerContainerBase< ::com::sun::star::awt::XMouseMotionListener, WrappedMouseMotionEvent > SlideShowViewMouseMotionListeners_Base; @@ -165,8 +160,6 @@ protected: }; typedef ::std::auto_ptr< SlideShowViewMouseMotionListeners > SlideShowViewMouseMotionListenersPtr; - - // SlideShowView class ShowWindow; class SlideshowImpl; @@ -258,7 +251,6 @@ private: ::com::sun::star::geometry::IntegerSize2D mTranslationOffset; }; - } // namespace ::sd #endif diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx index 1229588cc911..34de47bc9495 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "SlsBitmapCache.hxx" #include "SlsCacheCompactor.hxx" #include "SlsBitmapCompressor.hxx" @@ -113,10 +112,8 @@ typedef ::std::vector< } }; - } // end of anonymous namespace - //===== BitmapCache ========================================================= BitmapCache::BitmapCache (const sal_Int32 nMaximalNormalCacheSize) @@ -141,17 +138,11 @@ BitmapCache::BitmapCache (const sal_Int32 nMaximalNormalCacheSize) mpCacheCompactor = CacheCompactor::Create(*this,mnMaximalNormalCacheSize); } - - - BitmapCache::~BitmapCache (void) { Clear(); } - - - void BitmapCache::Clear (void) { ::osl::MutexGuard aGuard (maMutex); @@ -162,17 +153,6 @@ void BitmapCache::Clear (void) mnCurrentAccessTime = 0; } - - - - - - - - - - - bool BitmapCache::HasBitmap (const CacheKey& rKey) { ::osl::MutexGuard aGuard (maMutex); @@ -182,9 +162,6 @@ bool BitmapCache::HasBitmap (const CacheKey& rKey) && (iEntry->second.HasPreview() || iEntry->second.HasReplacement())); } - - - bool BitmapCache::BitmapIsUpToDate (const CacheKey& rKey) { ::osl::MutexGuard aGuard (maMutex); @@ -197,9 +174,6 @@ bool BitmapCache::BitmapIsUpToDate (const CacheKey& rKey) return bIsUpToDate; } - - - Bitmap BitmapCache::GetBitmap (const CacheKey& rKey) { ::osl::MutexGuard aGuard (maMutex); @@ -228,9 +202,6 @@ Bitmap BitmapCache::GetBitmap (const CacheKey& rKey) return iEntry->second.GetPreview(); } - - - Bitmap BitmapCache::GetMarkedBitmap (const CacheKey& rKey) { ::osl::MutexGuard aGuard (maMutex); @@ -245,9 +216,6 @@ Bitmap BitmapCache::GetMarkedBitmap (const CacheKey& rKey) return Bitmap(); } - - - void BitmapCache::ReleaseBitmap (const CacheKey& rKey) { ::osl::MutexGuard aGuard (maMutex); @@ -260,9 +228,6 @@ void BitmapCache::ReleaseBitmap (const CacheKey& rKey) } } - - - bool BitmapCache::InvalidateBitmap (const CacheKey& rKey) { ::osl::MutexGuard aGuard (maMutex); @@ -286,9 +251,6 @@ bool BitmapCache::InvalidateBitmap (const CacheKey& rKey) return false; } - - - void BitmapCache::InvalidateCache (void) { ::osl::MutexGuard aGuard (maMutex); @@ -301,9 +263,6 @@ void BitmapCache::InvalidateCache (void) ReCalculateTotalCacheSize(); } - - - void BitmapCache::SetBitmap ( const CacheKey& rKey, const Bitmap& rPreview, @@ -331,9 +290,6 @@ void BitmapCache::SetBitmap ( UpdateCacheSize(iEntry->second, ADD); } - - - void BitmapCache::SetMarkedBitmap ( const CacheKey& rKey, const Bitmap& rPreview) @@ -350,9 +306,6 @@ void BitmapCache::SetMarkedBitmap ( } } - - - void BitmapCache::SetPrecious (const CacheKey& rKey, bool bIsPrecious) { ::osl::MutexGuard aGuard (maMutex); @@ -377,9 +330,6 @@ void BitmapCache::SetPrecious (const CacheKey& rKey, bool bIsPrecious) } } - - - void BitmapCache::ReCalculateTotalCacheSize (void) { ::osl::MutexGuard aGuard (maMutex); @@ -399,9 +349,6 @@ void BitmapCache::ReCalculateTotalCacheSize (void) SAL_INFO("sd.sls", OSL_THIS_FUNC << ": cache size is " << mnNormalCacheSize << "/" << mnPreciousCacheSize); } - - - void BitmapCache::Recycle (const BitmapCache& rCache) { ::osl::MutexGuard aGuard (maMutex); @@ -429,8 +376,6 @@ void BitmapCache::Recycle (const BitmapCache& rCache) } } - - SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<BitmapCache::CacheIndex> BitmapCache::GetCacheIndex ( bool bIncludePrecious, @@ -469,8 +414,6 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH } SAL_WNODEPRECATED_DECLARATIONS_POP - - void BitmapCache::Compress ( const CacheKey& rKey, const ::boost::shared_ptr<BitmapCompressor>& rpCompressor) @@ -486,9 +429,6 @@ void BitmapCache::Compress ( } } - - - void BitmapCache::UpdateCacheSize (const CacheEntry& rEntry, CacheOperation eOperation) { sal_Int32 nEntrySize (rEntry.GetMemorySize()); @@ -517,9 +457,6 @@ void BitmapCache::UpdateCacheSize (const CacheEntry& rEntry, CacheOperation eOpe } } - - - //===== CacheEntry ============================================================ BitmapCache::CacheEntry::CacheEntry( @@ -533,9 +470,6 @@ BitmapCache::CacheEntry::CacheEntry( { } - - - BitmapCache::CacheEntry::CacheEntry( const Bitmap& rPreview, sal_Int32 nLastAccessTime, @@ -548,9 +482,6 @@ BitmapCache::CacheEntry::CacheEntry( { } - - - inline void BitmapCache::CacheEntry::Recycle (const CacheEntry& rEntry) { if ((rEntry.HasPreview() || rEntry.HasLosslessReplacement()) @@ -565,9 +496,6 @@ inline void BitmapCache::CacheEntry::Recycle (const CacheEntry& rEntry) } } - - - inline sal_Int32 BitmapCache::CacheEntry::GetMemorySize (void) const { sal_Int32 nSize (0); @@ -578,9 +506,6 @@ inline sal_Int32 BitmapCache::CacheEntry::GetMemorySize (void) const return nSize; } - - - void BitmapCache::CacheEntry::Compress (const ::boost::shared_ptr<BitmapCompressor>& rpCompressor) { if ( ! maPreview.IsEmpty()) @@ -606,9 +531,6 @@ void BitmapCache::CacheEntry::Compress (const ::boost::shared_ptr<BitmapCompress } } - - - inline void BitmapCache::CacheEntry::Decompress (void) { if (mpReplacement.get()!=NULL && mpCompressor.get()!=NULL && maPreview.IsEmpty()) @@ -620,8 +542,6 @@ inline void BitmapCache::CacheEntry::Decompress (void) } } - - inline void BitmapCache::CacheEntry::SetPreview (const Bitmap& rPreview) { maPreview = rPreview; @@ -630,25 +550,16 @@ inline void BitmapCache::CacheEntry::SetPreview (const Bitmap& rPreview) mpCompressor.reset(); } - - - bool BitmapCache::CacheEntry::HasPreview (void) const { return ! maPreview.IsEmpty(); } - - - inline void BitmapCache::CacheEntry::SetMarkedPreview (const Bitmap& rMarkedPreview) { maMarkedPreview = rMarkedPreview; } - - - inline bool BitmapCache::CacheEntry::HasLosslessReplacement (void) const { return mpReplacement.get()!=NULL @@ -656,7 +567,6 @@ inline bool BitmapCache::CacheEntry::HasLosslessReplacement (void) const && mpCompressor->IsLossless(); } - } } } // end of namespace ::sd::slidesorter::cache /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx index 0b892be83943..4ccd2214ce65 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx @@ -219,8 +219,6 @@ private: void UpdateCacheSize (const CacheEntry& rKey, CacheOperation eOperation); }; - - } } } // end of namespace ::sd::slidesorter::cache #endif diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx index 6d226edbd7f5..ca59270f227b 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "SlsBitmapCompressor.hxx" #include <tools/stream.hxx> @@ -27,7 +26,6 @@ namespace sd { namespace slidesorter { namespace cache { - //===== NoBitmapCompression =================================================== /** This dummy replacement simply stores a shared pointer to the original @@ -45,8 +43,6 @@ public: virtual sal_Int32 GetMemorySize (void) const SAL_OVERRIDE { return maPreview.GetSizeBytes(); } }; - - ::boost::shared_ptr<BitmapReplacement> NoBitmapCompression::Compress (const Bitmap& rBitmap) const { return ::boost::shared_ptr<BitmapReplacement>(new DummyReplacement(rBitmap)); @@ -57,17 +53,11 @@ Bitmap NoBitmapCompression::Decompress (const BitmapReplacement& rBitmapData) co return dynamic_cast<const DummyReplacement&>(rBitmapData).maPreview; } - - - bool NoBitmapCompression::IsLossless (void) const { return true; } - - - //===== CompressionByDeletion ================================================= ::boost::shared_ptr<BitmapReplacement> CompressionByDeletion::Compress (const Bitmap& ) const @@ -75,9 +65,6 @@ bool NoBitmapCompression::IsLossless (void) const return ::boost::shared_ptr<BitmapReplacement>(); } - - - Bitmap CompressionByDeletion::Decompress (const BitmapReplacement& ) const { // Return a NULL pointer. This will eventually lead to a request for @@ -85,17 +72,11 @@ Bitmap CompressionByDeletion::Decompress (const BitmapReplacement& ) const return Bitmap(); } - - - bool CompressionByDeletion::IsLossless (void) const { return false; } - - - //===== ResolutionReduction =================================================== /** Store a scaled down bitmap together with the original size. @@ -135,9 +116,6 @@ sal_Int32 ResolutionReduction::ResolutionReducedReplacement::GetMemorySize (void return ::boost::shared_ptr<BitmapReplacement>(pResult); } - - - Bitmap ResolutionReduction::Decompress (const BitmapReplacement& rBitmapData) const { Bitmap aResult; @@ -155,20 +133,13 @@ Bitmap ResolutionReduction::Decompress (const BitmapReplacement& rBitmapData) co return aResult; } - - - bool ResolutionReduction::IsLossless (void) const { return false; } - - - //===== PNGCompression ======================================================== - class PngCompression::PngReplacement : public BitmapReplacement { public: @@ -190,9 +161,6 @@ public: } }; - - - ::boost::shared_ptr<BitmapReplacement> PngCompression::Compress (const Bitmap& rBitmap) const { ::vcl::PNGWriter aWriter (rBitmap); @@ -208,9 +176,6 @@ public: return ::boost::shared_ptr<BitmapReplacement>(pResult); } - - - Bitmap PngCompression::Decompress ( const BitmapReplacement& rBitmapData) const { @@ -226,17 +191,11 @@ Bitmap PngCompression::Decompress ( return aResult; } - - - bool PngCompression::IsLossless (void) const { return true; } - - - } } } // end of namespace ::sd::slidesorter::cache /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx index b9aaf18d80e5..1a218ae831db 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx @@ -23,14 +23,12 @@ #include <sal/types.h> #include <boost/shared_ptr.hpp> - class Bitmap; namespace sd { namespace slidesorter { namespace cache { class BitmapReplacement; - /** This interface class provides the minimal method set for classes that implement the compression and decompression of preview bitmaps. */ @@ -61,8 +59,6 @@ protected: ~BitmapCompressor() {} }; - - /** Interface for preview bitmap replacements. Each bitmap compressor/decompressor has to provide an implementation that is suitable to store the compressed bitmaps. @@ -76,9 +72,6 @@ protected: ~BitmapReplacement() {} }; - - - /** This is one trivial bitmap compressor. It stores bitmaps unmodified instead of compressing them. This compressor is lossless. @@ -94,9 +87,6 @@ public: virtual bool IsLossless (void) const SAL_OVERRIDE; }; - - - /** This is another trivial bitmap compressor. Instead of compressing a bitmap, it throws the bitmap away. Its Decompress() method returns a NULL pointer. The caller has to create a new preview bitmap instead. @@ -112,9 +102,6 @@ public: virtual bool IsLossless (void) const SAL_OVERRIDE; }; - - - /** Compress a preview bitmap by reducing its resolution. While the aspect ratio is maintained the horizontal resolution is scaled down to 100 pixels. @@ -134,9 +121,6 @@ public: virtual bool IsLossless (void) const SAL_OVERRIDE; }; - - - /** Compress preview bitmaps using the PNG format. This compressor is lossless. */ @@ -151,7 +135,6 @@ public: virtual bool IsLossless (void) const SAL_OVERRIDE; }; - } } } // end of namespace ::sd::slidesorter::cache #endif diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx index 58431bf2a1e9..d0297df50b7c 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "SlsBitmapFactory.hxx" #include "PreviewRenderer.hxx" @@ -44,16 +43,10 @@ BitmapFactory::BitmapFactory (void) { } - - - BitmapFactory::~BitmapFactory (void) { } - - - Bitmap BitmapFactory::CreateBitmap ( const SdPage& rPage, const Size& rPixelSize, @@ -82,9 +75,6 @@ Bitmap BitmapFactory::CreateBitmap ( return aPreview; } - } } } // end of namespace ::sd::slidesorter::cache - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx index 3bd04aa77194..9e84e05f8208 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx @@ -46,8 +46,6 @@ private: PreviewRenderer maRenderer; }; - - } } } // end of namespace ::sd::slidesorter::cache #endif diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx index cf9b19967146..4217ba068660 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "SlsCacheCompactor.hxx" #include "SlsBitmapCompressor.hxx" @@ -52,9 +51,6 @@ protected: virtual void Run (void) SAL_OVERRIDE { /* Do nothing */ }; }; - - - /** This implementation of the CacheCompactor interface class uses one of several bitmap compression algorithms to reduce the number of the bytes of the off-screen previews in the bitmap cache. See the documentation @@ -77,7 +73,6 @@ private: ::boost::shared_ptr< ::sd::slidesorter::cache::BitmapCompressor> mpCompressor; }; - } // end of anonymous namespace namespace sd { namespace slidesorter { namespace cache { @@ -121,18 +116,12 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH } SAL_WNODEPRECATED_DECLARATIONS_POP - - - void CacheCompactor::RequestCompaction (void) { if ( ! mbIsCompactionRunning && ! maCompactionTimer.IsActive()) maCompactionTimer.Start(); } - - - CacheCompactor::CacheCompactor( BitmapCache& rCache, sal_Int32 nMaximalCacheSize) @@ -145,9 +134,6 @@ CacheCompactor::CacheCompactor( } - - - IMPL_LINK_NOARG(CacheCompactor, CompactionCallback) { mbIsCompactionRunning = true; @@ -167,14 +153,8 @@ IMPL_LINK_NOARG(CacheCompactor, CompactionCallback) return 1; } - - - } } } // end of namespace ::sd::slidesorter::cache - - - namespace { //===== CacheCompactionByCompression ========================================== @@ -188,9 +168,6 @@ CacheCompactionByCompression::CacheCompactionByCompression ( { } - - - void CacheCompactionByCompression::Run (void) { if (mrCache.GetSize() > mnMaximalCacheSize) @@ -216,7 +193,6 @@ void CacheCompactionByCompression::Run (void) } } - } // end of anonymous namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx index cb7c7d25a41b..2edf11717e4e 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx @@ -85,9 +85,6 @@ private: DECL_LINK(CompactionCallback, void *); }; - - - } } } // end of namespace ::sd::slidesorter::cache #endif diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx index a67a16d37294..1c842e8ec5c9 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "SlsCacheConfiguration.hxx" #include <osl/mutex.hxx> #include <rtl/instance.hxx> @@ -68,9 +67,6 @@ Timer CacheConfiguration::maReleaseTimer; return rInstancePtr; } - - - CacheConfiguration::CacheConfiguration (void) { // Get the cache size from configuration. @@ -123,9 +119,6 @@ CacheConfiguration::CacheConfiguration (void) } } - - - Any CacheConfiguration::GetValue (const OUString& rName) { Any aResult; @@ -144,9 +137,6 @@ Any CacheConfiguration::GetValue (const OUString& rName) return aResult; } - - - IMPL_LINK_NOARG(CacheConfiguration, TimerCallback) { CacheConfigSharedPtr &rInstancePtr = theInstance::get(); @@ -155,7 +145,6 @@ IMPL_LINK_NOARG(CacheConfiguration, TimerCallback) return 0; } - } } } // end of namespace ::sd::slidesorter::cache /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx index ca0339e40734..cd07fe46990c 100644 --- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "SlsGenericPageCache.hxx" #include "SlsQueueProcessor.hxx" @@ -28,7 +27,6 @@ #include "model/SlsPageDescriptor.hxx" #include "controller/SlideSorterController.hxx" - namespace sd { namespace slidesorter { namespace cache { GenericPageCache::GenericPageCache ( @@ -49,9 +47,6 @@ GenericPageCache::GenericPageCache ( "This may indicate an error."); } - - - GenericPageCache::~GenericPageCache (void) { if (mpQueueProcessor.get() != NULL) @@ -66,9 +61,6 @@ GenericPageCache::~GenericPageCache (void) mpBitmapCache.reset(); } - - - void GenericPageCache::ProvideCacheAndProcessor (void) { if (mpBitmapCache.get() == NULL) @@ -85,9 +77,6 @@ void GenericPageCache::ProvideCacheAndProcessor (void) mpCacheContext)); } - - - void GenericPageCache::ChangePreviewSize ( const Size& rPreviewSize, const bool bDoSuperSampling) @@ -115,9 +104,6 @@ void GenericPageCache::ChangePreviewSize ( } } - - - Bitmap GenericPageCache::GetPreviewBitmap ( const CacheKey aKey, const bool bResize) @@ -156,9 +142,6 @@ Bitmap GenericPageCache::GetPreviewBitmap ( return aPreview; } - - - Bitmap GenericPageCache::GetMarkedPreviewBitmap ( const CacheKey aKey, const bool bResize) @@ -182,9 +165,6 @@ Bitmap GenericPageCache::GetMarkedPreviewBitmap ( return aMarkedPreview; } - - - void GenericPageCache::SetMarkedPreviewBitmap ( const CacheKey aKey, const Bitmap& rMarkedBitmap) @@ -196,9 +176,6 @@ void GenericPageCache::SetMarkedPreviewBitmap ( mpBitmapCache->SetMarkedBitmap(pPage, rMarkedBitmap); } - - - void GenericPageCache::RequestPreviewBitmap ( const CacheKey aKey, const bool bMayBeUpToDate) @@ -236,9 +213,6 @@ void GenericPageCache::RequestPreviewBitmap ( } } - - - bool GenericPageCache::InvalidatePreviewBitmap (const CacheKey aKey) { // Invalidate the page in all caches that reference it, not just this one. @@ -273,9 +247,6 @@ void GenericPageCache::InvalidateCache (const bool bUpdateCache) } } - - - void GenericPageCache::SetPreciousFlag ( const CacheKey aKey, const bool bIsPrecious) @@ -305,9 +276,6 @@ void GenericPageCache::SetPreciousFlag ( mpBitmapCache->SetPrecious(mpCacheContext->GetPage(aKey), bIsPrecious); } - - - void GenericPageCache::Pause (void) { ProvideCacheAndProcessor(); @@ -315,9 +283,6 @@ void GenericPageCache::Pause (void) mpQueueProcessor->Pause(); } - - - void GenericPageCache::Resume (void) { ProvideCacheAndProcessor(); @@ -325,10 +290,6 @@ void GenericPageCache::Resume (void) mpQueueProcessor->Resume(); } - - } } } // end of namespace ::sd::slidesorter::cache - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx index 3dbc8486366d..93c9ade141ea 100644 --- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx +++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx @@ -148,7 +148,6 @@ private: void ProvideCacheAndProcessor (void); }; - } } } // end of namespace ::sd::slidesorter::cache #endif diff --git a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx index 294ae9f76f64..34da19a50ec7 100644 --- a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/gen.hxx> #include "SlsGenericPageCache.hxx" #include "SlsRequestFactory.hxx" @@ -26,10 +25,8 @@ using namespace ::com::sun::star; - namespace sd { namespace slidesorter { namespace cache { - //===== PageCache ============================================================= PageCache::PageCache ( @@ -44,16 +41,10 @@ PageCache::PageCache ( { } - - - PageCache::~PageCache (void) { } - - - void PageCache::ChangeSize ( const Size& rPreviewSize, const bool bDoSuperSampling) @@ -61,9 +52,6 @@ void PageCache::ChangeSize ( mpImplementation->ChangePreviewSize(rPreviewSize, bDoSuperSampling); } - - - Bitmap PageCache::GetPreviewBitmap ( const CacheKey aKey, const bool bResize) @@ -71,9 +59,6 @@ Bitmap PageCache::GetPreviewBitmap ( return mpImplementation->GetPreviewBitmap(aKey, bResize); } - - - Bitmap PageCache::GetMarkedPreviewBitmap ( const CacheKey aKey, const bool bResize) @@ -81,9 +66,6 @@ Bitmap PageCache::GetMarkedPreviewBitmap ( return mpImplementation->GetMarkedPreviewBitmap(aKey, bResize); } - - - void PageCache::SetMarkedPreviewBitmap ( const CacheKey aKey, const Bitmap& rMarkedBitmap) @@ -91,17 +73,11 @@ void PageCache::SetMarkedPreviewBitmap ( mpImplementation->SetMarkedPreviewBitmap(aKey, rMarkedBitmap); } - - - void PageCache::RequestPreviewBitmap (const CacheKey aKey) { return mpImplementation->RequestPreviewBitmap(aKey); } - - - void PageCache::InvalidatePreviewBitmap ( const CacheKey aKey, const bool bRequestPreview) @@ -110,17 +86,11 @@ void PageCache::InvalidatePreviewBitmap ( RequestPreviewBitmap(aKey); } - - - void PageCache::InvalidateCache (const bool bUpdateCache) { mpImplementation->InvalidateCache(bUpdateCache); } - - - void PageCache::SetPreciousFlag ( const CacheKey aKey, const bool bIsPrecious) @@ -128,23 +98,16 @@ void PageCache::SetPreciousFlag ( mpImplementation->SetPreciousFlag(aKey, bIsPrecious); } - - - void PageCache::Pause (void) { mpImplementation->Pause(); } - - - void PageCache::Resume (void) { mpImplementation->Resume(); } - } } } // end of namespace ::sd::slidesorter::cache /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx index 699a0338dc35..69cdad364e3b 100644 --- a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx +++ b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "cache/SlsPageCacheManager.hxx" #include "SlsBitmapCache.hxx" @@ -55,9 +54,6 @@ public: } }; }; - - - /** Collection of data that is stored for the inactive, recently used caches. */ @@ -76,18 +72,12 @@ public: {} }; - - - /** The list of recently used caches is organized as queue. When elements are added the list is shortened to the maximally allowed number of elements by removing the least recently used elements. */ typedef ::std::deque<RecentlyUsedCacheDescriptor> RecentlyUsedQueue; - - - /** Compare the caches by preview size. Those that match the given size come first, then, regardless of the given size, the largest ones before the smaller ones. @@ -116,7 +106,6 @@ private: } // end of anonymous namespace - namespace sd { namespace slidesorter { namespace cache { /** Container for the active caches. @@ -143,7 +132,6 @@ public: }; }; - /** The recently used caches are stored in one queue for each document. */ class PageCacheManager::RecentlyUsedPageCaches @@ -153,17 +141,12 @@ public: RecentlyUsedPageCaches (void) {}; }; - - - class PageCacheManager::Deleter { public: void operator() (PageCacheManager* pObject) { delete pObject; } }; - - //===== PageCacheManager ==================================================== ::boost::weak_ptr<PageCacheManager> PageCacheManager::mpInstance; @@ -186,9 +169,6 @@ public: return pInstance; } - - - PageCacheManager::PageCacheManager (void) : mpPageCaches(new PageCacheContainer()), mpRecentlyUsedPageCaches(new RecentlyUsedPageCaches()), @@ -196,16 +176,10 @@ PageCacheManager::PageCacheManager (void) { } - - - PageCacheManager::~PageCacheManager (void) { } - - - ::boost::shared_ptr<PageCacheManager::Cache> PageCacheManager::GetCache ( DocumentKey pDocument, const Size& rPreviewSize) @@ -238,9 +212,6 @@ PageCacheManager::~PageCacheManager (void) return pResult; } - - - void PageCacheManager::Recycle ( const ::boost::shared_ptr<Cache>& rpCache, DocumentKey pDocument, @@ -276,9 +247,6 @@ void PageCacheManager::Recycle ( } } - - - void PageCacheManager::ReleaseCache (const ::boost::shared_ptr<Cache>& rpCache) { PageCacheContainer::iterator iCache (::std::find_if( @@ -296,9 +264,6 @@ void PageCacheManager::ReleaseCache (const ::boost::shared_ptr<Cache>& rpCache) } } - - - ::boost::shared_ptr<PageCacheManager::Cache> PageCacheManager::ChangeSize ( const ::boost::shared_ptr<Cache>& rpCache, const Size& rOldPreviewSize, @@ -340,9 +305,6 @@ void PageCacheManager::ReleaseCache (const ::boost::shared_ptr<Cache>& rpCache) return pResult; } - - - bool PageCacheManager::InvalidatePreviewBitmap ( DocumentKey pDocument, const SdrPage* pKey) @@ -372,9 +334,6 @@ bool PageCacheManager::InvalidatePreviewBitmap ( return bHasChanged; } - - - void PageCacheManager::InvalidateAllPreviewBitmaps (DocumentKey pDocument) { if (pDocument == NULL) @@ -398,9 +357,6 @@ void PageCacheManager::InvalidateAllPreviewBitmaps (DocumentKey pDocument) } } - - - void PageCacheManager::InvalidateAllCaches (void) { // Iterate over all caches that are currently in use and invalidate @@ -414,9 +370,6 @@ void PageCacheManager::InvalidateAllCaches (void) mpRecentlyUsedPageCaches->clear(); } - - - void PageCacheManager::ReleasePreviewBitmap (const SdrPage* pPage) { PageCacheContainer::iterator iCache; @@ -424,9 +377,6 @@ void PageCacheManager::ReleasePreviewBitmap (const SdrPage* pPage) iCache->second->ReleaseBitmap(pPage); } - - - ::boost::shared_ptr<PageCacheManager::Cache> PageCacheManager::GetRecentlyUsedCache ( DocumentKey pDocument, const Size& rPreviewSize) @@ -450,9 +400,6 @@ void PageCacheManager::ReleasePreviewBitmap (const SdrPage* pPage) return pCache; } - - - void PageCacheManager::PutRecentlyUsedCache( DocumentKey pDocument, const Size& rPreviewSize, @@ -474,8 +421,6 @@ void PageCacheManager::PutRecentlyUsedCache( } } - - } } } // end of namespace ::sd::slidesorter::cache /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx index 2b7fe1330745..cc6c78865427 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx @@ -17,14 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "SlsQueueProcessor.hxx" #include "SlsCacheConfiguration.hxx" #include "SlsRequestQueue.hxx" namespace sd { namespace slidesorter { namespace cache { - //===== QueueProcessor ====================================================== QueueProcessor::QueueProcessor ( @@ -64,17 +62,10 @@ QueueProcessor::QueueProcessor ( maTimer.SetTimeout (mnTimeBetweenHighPriorityRequests); } - - - - QueueProcessor::~QueueProcessor (void) { } - - - void QueueProcessor::Start (int nPriorityClass) { if (mbIsPaused) @@ -89,26 +80,17 @@ void QueueProcessor::Start (int nPriorityClass) } } - - - void QueueProcessor::Stop (void) { if (maTimer.IsActive()) maTimer.Stop(); } - - - void QueueProcessor::Pause (void) { mbIsPaused = true; } - - - void QueueProcessor::Resume (void) { mbIsPaused = false; @@ -116,16 +98,10 @@ void QueueProcessor::Resume (void) Start(mrQueue.GetFrontPriorityClass()); } - - - void QueueProcessor::Terminate (void) { } - - - void QueueProcessor::SetPreviewSize ( const Size& rPreviewSize, const bool bDoSuperSampling) @@ -134,18 +110,12 @@ void QueueProcessor::SetPreviewSize ( mbDoSuperSampling = bDoSuperSampling; } - - - IMPL_LINK_NOARG(QueueProcessor, ProcessRequestHdl) { ProcessRequests(); return 1; } - - - void QueueProcessor::ProcessRequests (void) { OSL_ASSERT(mpCacheContext.get()!=NULL); @@ -182,9 +152,6 @@ void QueueProcessor::ProcessRequests (void) } } - - - void QueueProcessor::ProcessOneRequest ( CacheKey aKey, const RequestPriorityClass ePriorityClass) @@ -225,7 +192,6 @@ void QueueProcessor::SetBitmapCache ( mpCache = rpCache; } - } } } // end of namespace ::sd::slidesorter::cache /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx index 71d7e31d3fd1..1e34261caa61 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx @@ -34,20 +34,15 @@ #include <vcl/timer.hxx> #include <boost/function.hpp> - namespace sd { namespace slidesorter { namespace view { class SlideSorterView; } } } - - namespace sd { namespace slidesorter { namespace cache { class BitmapCache; class RequestQueue; - - /** This queue processor is timer based, i.e. when an entry is added to the queue and the processor is started with Start() in the base class a timer is started that eventually calls ProcessRequest(). This is @@ -116,9 +111,6 @@ private: const RequestPriorityClass ePriorityClass); }; - - - } } } // end of namespace ::sd::slidesorter::cache #endif diff --git a/sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx b/sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx index 0816bc9aafff..ce4b860710d7 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "SlsRequestFactory.hxx" #include "SlsGenericPageCache.hxx" @@ -29,7 +28,6 @@ #include <svx/sdrpagewindow.hxx> #include <svx/sdr/contact/viewcontact.hxx> - namespace sd { namespace slidesorter { namespace cache { void RequestFactory::operator()( @@ -59,10 +57,6 @@ void RequestFactory::operator()( } } - - } } } // end of namespace ::sd::slidesorter::cache - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/cache/SlsRequestFactory.hxx b/sd/source/ui/slidesorter/cache/SlsRequestFactory.hxx index 61b9e6042a20..8d86fbd73ce2 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestFactory.hxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestFactory.hxx @@ -34,7 +34,6 @@ public: const SharedCacheContext& rpCacheContext); }; - } } } // end of namespace ::sd::slidesorter::cache #endif diff --git a/sd/source/ui/slidesorter/cache/SlsRequestPriorityClass.hxx b/sd/source/ui/slidesorter/cache/SlsRequestPriorityClass.hxx index 8d7b5f657f7d..077a5ce4916d 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestPriorityClass.hxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestPriorityClass.hxx @@ -22,7 +22,6 @@ namespace sd { namespace slidesorter { namespace cache { - /** Each request for a preview creation has a priority. This enum defines the available priorities. The special values MIN__CLASS and MAX__CLASS are/can be used for validation and have to be kept up-to-date. @@ -41,7 +40,6 @@ enum RequestPriorityClass MAX__CLASS = NOT_VISIBLE }; - } } } // end of namespace ::sd::slidesorter::cache #endif diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx index cc8004f88b89..daacee5be8ff 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "SlsRequestQueue.hxx" #include <set> @@ -74,7 +73,6 @@ public: RequestPriorityClass meClass; }; - class RequestQueue::Container : public ::std::set< Request, @@ -82,12 +80,8 @@ class RequestQueue::Container { }; - - - //===== GenericRequestQueue ================================================= - RequestQueue::RequestQueue (const SharedCacheContext& rpCacheContext) : maMutex(), mpRequestQueue(new Container()), @@ -97,17 +91,11 @@ RequestQueue::RequestQueue (const SharedCacheContext& rpCacheContext) { } - - - RequestQueue::~RequestQueue (void) { Clear(); } - - - void RequestQueue::AddRequest ( CacheKey aKey, RequestPriorityClass eRequestClass, @@ -191,9 +179,6 @@ bool RequestQueue::RemoveRequest ( return bRequestWasRemoved; } - - - void RequestQueue::ChangeClass ( CacheKey aKey, RequestPriorityClass eNewRequestClass) @@ -214,9 +199,6 @@ void RequestQueue::ChangeClass ( } } - - - CacheKey RequestQueue::GetFront (void) { ::osl::MutexGuard aGuard (maMutex); @@ -228,9 +210,6 @@ CacheKey RequestQueue::GetFront (void) return mpRequestQueue->begin()->maKey; } - - - RequestPriorityClass RequestQueue::GetFrontPriorityClass (void) { ::osl::MutexGuard aGuard (maMutex); @@ -242,9 +221,6 @@ RequestPriorityClass RequestQueue::GetFrontPriorityClass (void) return mpRequestQueue->begin()->meClass; } - - - void RequestQueue::PopFront (void) { ::osl::MutexGuard aGuard (maMutex); @@ -267,18 +243,12 @@ void RequestQueue::PopFront (void) } } - - - bool RequestQueue::IsEmpty (void) { ::osl::MutexGuard aGuard (maMutex); return mpRequestQueue->empty(); } - - - void RequestQueue::Clear (void) { ::osl::MutexGuard aGuard (maMutex); @@ -294,13 +264,6 @@ void RequestQueue::Clear (void) mnMaximumPriority = 1; } - - - - - } } } // end of namespace ::sd::slidesorter::cache - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx index ef28bcd8d0a6..be9b5909bb6d 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx @@ -27,7 +27,6 @@ #include <osl/mutex.hxx> #include <svx/sdrpageuser.hxx> - namespace sd { namespace slidesorter { namespace cache { class RequestData; @@ -125,7 +124,6 @@ private: int mnMaximumPriority; }; - } } } // end of namespace ::sd::slidesorter::cache #endif diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index 0d560b2fe043..a22be58d8673 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "controller/SlideSorterController.hxx" #include "SlideSorter.hxx" @@ -93,7 +92,6 @@ using namespace ::basegfx; namespace sd { namespace slidesorter { namespace controller { - SlideSorterController::SlideSorterController (SlideSorter& rSlideSorter) : mrSlideSorter(rSlideSorter), mrModel(mrSlideSorter.GetModel()), @@ -138,9 +136,6 @@ SlideSorterController::SlideSorterController (SlideSorter& rSlideSorter) } } - - - void SlideSorterController::Init (void) { mpCurrentSlideManager.reset(new CurrentSlideManager(mrSlideSorter)); @@ -166,9 +161,6 @@ void SlideSorterController::Init (void) GetSelectionManager()->SelectionHasChanged(); } - - - SlideSorterController::~SlideSorterController (void) { try @@ -187,9 +179,6 @@ SlideSorterController::~SlideSorterController (void) // to shut down cleanly. } - - - void SlideSorterController::Dispose (void) { mpInsertionIndicatorHandler->End(Animator::AM_Immediate); @@ -198,9 +187,6 @@ void SlideSorterController::Dispose (void) mpAnimator->Dispose(); } - - - model::SharedPageDescriptor SlideSorterController::GetPageAt ( const Point& aWindowPosition) { @@ -230,72 +216,48 @@ model::SharedPageDescriptor SlideSorterController::GetPageAt ( return pDescriptorAtPoint; } - - - PageSelector& SlideSorterController::GetPageSelector (void) { OSL_ASSERT(mpPageSelector.get()!=NULL); return *mpPageSelector.get(); } - - - FocusManager& SlideSorterController::GetFocusManager (void) { OSL_ASSERT(mpFocusManager.get()!=NULL); return *mpFocusManager.get(); } - - - Clipboard& SlideSorterController::GetClipboard (void) { OSL_ASSERT(mpClipboard.get()!=NULL); return *mpClipboard.get(); } - - - ScrollBarManager& SlideSorterController::GetScrollBarManager (void) { OSL_ASSERT(mpScrollBarManager.get()!=NULL); return *mpScrollBarManager.get(); } - - - ::boost::shared_ptr<CurrentSlideManager> SlideSorterController::GetCurrentSlideManager (void) const { OSL_ASSERT(mpCurrentSlideManager.get()!=NULL); return mpCurrentSlideManager; } - - - ::boost::shared_ptr<SlotManager> SlideSorterController::GetSlotManager (void) const { OSL_ASSERT(mpSlotManager.get()!=NULL); return mpSlotManager; } - - - ::boost::shared_ptr<SelectionManager> SlideSorterController::GetSelectionManager (void) const { OSL_ASSERT(mpSelectionManager.get()!=NULL); return mpSelectionManager; } - - - ::boost::shared_ptr<InsertionIndicatorHandler> SlideSorterController::GetInsertionIndicatorHandler (void) const { @@ -303,9 +265,6 @@ ScrollBarManager& SlideSorterController::GetScrollBarManager (void) return mpInsertionIndicatorHandler; } - - - void SlideSorterController::Paint ( const Rectangle& rBBox, ::Window* pWindow) @@ -327,33 +286,21 @@ void SlideSorterController::Paint ( } } - - - void SlideSorterController::FuTemporary (SfxRequest& rRequest) { mpSlotManager->FuTemporary (rRequest); } - - - void SlideSorterController::FuPermanent (SfxRequest &rRequest) { mpSlotManager->FuPermanent (rRequest); } - - - void SlideSorterController::FuSupport (SfxRequest &rRequest) { mpSlotManager->FuSupport (rRequest); } - - - bool SlideSorterController::Command ( const CommandEvent& rEvent, ::sd::Window* pWindow) @@ -519,17 +466,11 @@ bool SlideSorterController::Command ( return bEventHasBeenHandled; } - - - void SlideSorterController::LockModelChange (void) { mnModelChangeLockCount += 1; } - - - void SlideSorterController::UnlockModelChange (void) { mnModelChangeLockCount -= 1; @@ -539,9 +480,6 @@ void SlideSorterController::UnlockModelChange (void) } } - - - void SlideSorterController::PreModelChange (void) { // Prevent PreModelChange to execute more than once per model lock. @@ -561,9 +499,6 @@ void SlideSorterController::PreModelChange (void) mbPostModelChangePending = true; } - - - void SlideSorterController::PostModelChange (void) { mbPostModelChangePending = false; @@ -590,9 +525,6 @@ void SlideSorterController::PostModelChange (void) ViewShellHint(ViewShellHint::HINT_COMPLEX_MODEL_CHANGE_END)); } - - - void SlideSorterController::HandleModelChange (void) { // Ignore this call when the document is not in a valid state, i.e. has @@ -606,9 +538,6 @@ void SlideSorterController::HandleModelChange (void) } } - - - IMPL_LINK(SlideSorterController, WindowEventHandler, VclWindowEvent*, pEvent) { if (pEvent != NULL) @@ -680,9 +609,6 @@ IMPL_LINK(SlideSorterController, WindowEventHandler, VclWindowEvent*, pEvent) return sal_True; } - - - void SlideSorterController::GetCtrlState (SfxItemSet& rSet) { if (rSet.GetItemState(SID_RELOAD) != SFX_ITEM_UNKNOWN) @@ -741,49 +667,31 @@ void SlideSorterController::GetCtrlState (SfxItemSet& rSet) } } - - - void SlideSorterController::GetStatusBarState (SfxItemSet& rSet) { mpSlotManager->GetStatusBarState (rSet); } - - - void SlideSorterController::ExecCtrl (SfxRequest& rRequest) { mpSlotManager->ExecCtrl (rRequest); } - - - void SlideSorterController::GetAttrState (SfxItemSet& rSet) { mpSlotManager->GetAttrState (rSet); } - - - void SlideSorterController::ExecStatusBar (SfxRequest& ) { } - - - void SlideSorterController::UpdateAllPages (void) { // Do a redraw. mrSlideSorter.GetContentWindow()->Invalidate(); } - - - Rectangle SlideSorterController::Resize (const Rectangle& rAvailableSpace) { Rectangle aContentArea (rAvailableSpace); @@ -797,9 +705,6 @@ Rectangle SlideSorterController::Resize (const Rectangle& rAvailableSpace) return aContentArea; } - - - Rectangle SlideSorterController::Rearrange (bool bForce) { Rectangle aNewContentArea (maTotalWindowArea); @@ -855,27 +760,18 @@ Rectangle SlideSorterController::Rearrange (bool bForce) return aNewContentArea; } - - - rtl::Reference<FuPoor> SlideSorterController::CreateSelectionFunction (SfxRequest& rRequest) { rtl::Reference<FuPoor> xFunc( SelectionFunction::Create(mrSlideSorter, rRequest) ); return xFunc; } - - - ::rtl::Reference<SelectionFunction> SlideSorterController::GetCurrentSelectionFunction (void) { rtl::Reference<FuPoor> pFunction (mrSlideSorter.GetViewShell()->GetCurrentFunction()); return ::rtl::Reference<SelectionFunction>(dynamic_cast<SelectionFunction*>(pFunction.get())); } - - - void SlideSorterController::PrepareEditModeChange (void) { // Before we throw away the page descriptors we prepare for selecting @@ -909,9 +805,6 @@ void SlideSorterController::PrepareEditModeChange (void) } } - - - bool SlideSorterController::ChangeEditMode (EditMode eEditMode) { bool bResult (false); @@ -927,9 +820,6 @@ bool SlideSorterController::ChangeEditMode (EditMode eEditMode) return bResult; } - - - void SlideSorterController::FinishEditModeChange (void) { if (mrModel.GetEditMode() == EM_MASTERPAGE) @@ -971,9 +861,6 @@ void SlideSorterController::FinishEditModeChange (void) mpEditModeChangeMasterPage = NULL; } - - - void SlideSorterController::PageNameHasChanged (int nPageIndex, const OUString& rsOldName) { // Request a repaint for the page object whose name has changed. @@ -1020,9 +907,6 @@ void SlideSorterController::PageNameHasChanged (int nPageIndex, const OUString& makeAny(sNewName)); } - - - void SlideSorterController::SetDocumentSlides (const Reference<container::XIndexAccess>& rxSlides) { if (mrModel.GetDocumentSlides() != rxSlides) @@ -1034,22 +918,12 @@ void SlideSorterController::SetDocumentSlides (const Reference<container::XIndex } } - - - - - - - VisibleAreaManager& SlideSorterController::GetVisibleAreaManager (void) const { OSL_ASSERT(mpVisibleAreaManager); return *mpVisibleAreaManager; } - - - void SlideSorterController::CheckForMasterPageAssignment (void) { if (mrModel.GetPageCount()%2==0) @@ -1067,9 +941,6 @@ void SlideSorterController::CheckForMasterPageAssignment (void) } } - - - void SlideSorterController::CheckForSlideTransitionAssignment (void) { if (mrModel.GetPageCount()%2==0) @@ -1087,9 +958,6 @@ void SlideSorterController::CheckForSlideTransitionAssignment (void) } } - - - //===== SlideSorterController::ModelChangeLock ================================ SlideSorterController::ModelChangeLock::ModelChangeLock ( @@ -1099,17 +967,11 @@ SlideSorterController::ModelChangeLock::ModelChangeLock ( mpController->LockModelChange(); } - - - SlideSorterController::ModelChangeLock::~ModelChangeLock (void) { Release(); } - - - void SlideSorterController::ModelChangeLock::Release (void) { if (mpController != NULL) diff --git a/sd/source/ui/slidesorter/controller/SlsAnimationFunction.cxx b/sd/source/ui/slidesorter/controller/SlsAnimationFunction.cxx index 9fc4b54f3ba7..95661edd2725 100644 --- a/sd/source/ui/slidesorter/controller/SlsAnimationFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsAnimationFunction.cxx @@ -21,7 +21,6 @@ #include "model/SlsPageDescriptor.hxx" #include "view/SlideSorterView.hxx" - #include <osl/diagnose.hxx> #include <rtl/math.hxx> @@ -39,9 +38,6 @@ AnimationBezierFunction::AnimationBezierFunction ( { } - - - ::basegfx::B2DPoint AnimationBezierFunction::operator() (const double nT) { return ::basegfx::B2DPoint( @@ -49,9 +45,6 @@ AnimationBezierFunction::AnimationBezierFunction ( EvaluateComponent(nT, mnY1, mnY2)); } - - - double AnimationBezierFunction::EvaluateComponent ( const double nT, const double nV1, @@ -76,9 +69,6 @@ double AnimationBezierFunction::EvaluateComponent ( return nV0123; } - - - //===== AnimationParametricFunction =========================================== AnimationParametricFunction::AnimationParametricFunction (const ParametricFunction& rFunction) @@ -120,9 +110,6 @@ AnimationParametricFunction::AnimationParametricFunction (const ParametricFuncti } } - - - double AnimationParametricFunction::operator() (const double nX) { const sal_Int32 nIndex0 (static_cast<sal_Int32>(nX * maY.size())); @@ -139,7 +126,6 @@ double AnimationParametricFunction::operator() (const double nX) return maY[nIndex0]*nU + maY[nIndex1]*(1-nU); } - } } } // end of namespace ::sd::slidesorter::controller /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx index cab9f9244d53..fd50b7caf529 100644 --- a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx +++ b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx @@ -62,9 +62,6 @@ public: bool mbIsExpired; }; - - - Animator::Animator (SlideSorter& rSlideSorter) : mrSlideSorter(rSlideSorter), maTimer(), @@ -78,9 +75,6 @@ Animator::Animator (SlideSorter& rSlideSorter) maTimer.SetTimeoutHdl(LINK(this,Animator,TimeoutHandler)); } - - - Animator::~Animator (void) { if ( ! mbIsDisposed) @@ -90,9 +84,6 @@ Animator::~Animator (void) } } - - - void Animator::Dispose (void) { mbIsDisposed = true; @@ -110,9 +101,6 @@ void Animator::Dispose (void) } } - - - Animator::AnimationId Animator::AddAnimation ( const AnimationFunctor& rAnimation, const sal_Int32 nStartOffset, @@ -169,9 +157,6 @@ void Animator::RemoveAnimation (const Animator::AnimationId nId) } } - - - void Animator::RemoveAllAnimations (void) { ::std::for_each( @@ -188,9 +173,6 @@ void Animator::RemoveAllAnimations (void) mpDrawLock.reset(); } - - - bool Animator::ProcessAnimations (const double nTime) { bool bExpired (false); @@ -199,7 +181,6 @@ bool Animator::ProcessAnimations (const double nTime) if (mbIsDisposed) return bExpired; - AnimationList aCopy (maAnimations); AnimationList::const_iterator iAnimation; for (iAnimation=aCopy.begin(); iAnimation!=aCopy.end(); ++iAnimation) @@ -210,9 +191,6 @@ bool Animator::ProcessAnimations (const double nTime) return bExpired; } - - - void Animator::CleanUpAnimationList (void) { OSL_ASSERT( ! mbIsDisposed); @@ -231,9 +209,6 @@ void Animator::CleanUpAnimationList (void) maAnimations.swap(aActiveAnimations); } - - - void Animator::RequestNextFrame (const double nFrameStart) { (void)nFrameStart; @@ -247,9 +222,6 @@ void Animator::RequestNextFrame (const double nFrameStart) } } - - - IMPL_LINK_NOARG(Animator, TimeoutHandler) { if (mbIsDisposed) @@ -267,9 +239,6 @@ IMPL_LINK_NOARG(Animator, TimeoutHandler) return 0; } - - - //===== Animator::Animation =================================================== Animator::Animation::Animation ( @@ -290,16 +259,10 @@ Animator::Animation::Animation ( Run(nGlobalTime); } - - - Animator::Animation::~Animation (void) { } - - - bool Animator::Animation::Run (const double nGlobalTime) { if ( ! mbIsExpired) @@ -326,9 +289,6 @@ bool Animator::Animation::Run (const double nGlobalTime) return mbIsExpired; } - - - void Animator::Animation::Expire (void) { if ( ! mbIsExpired) @@ -339,13 +299,6 @@ void Animator::Animation::Expire (void) } } - - - - - - - } } } // end of namespace ::sd::slidesorter::controller /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx index d32381782631..fee1e6c96446 100644 --- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx +++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "controller/SlsClipboard.hxx" #include "SlideSorterViewShell.hxx" @@ -76,7 +75,6 @@ #include <vcl/svapp.hxx> #include <boost/bind.hpp> - namespace sd { namespace slidesorter { namespace controller { namespace { @@ -143,9 +141,6 @@ private: ::boost::shared_ptr<ViewShell> mpMainViewShell; }; - - - Clipboard::Clipboard (SlideSorter& rSlideSorter) : ViewClipboard(rSlideSorter.GetView()), mrSlideSorter(rSlideSorter), @@ -159,18 +154,12 @@ Clipboard::Clipboard (SlideSorter& rSlideSorter) { } - - - Clipboard::~Clipboard (void) { if (mnDragFinishedUserEventId != 0) Application::RemoveUserEvent(mnDragFinishedUserEventId); } - - - /** With the current implementation the forwarded calls to the current function will come back eventually to call the local Do(Cut|Copy|Paste) methods. A shortcut is possible but would be an unclean hack. @@ -228,9 +217,6 @@ void Clipboard::HandleSlotCall (SfxRequest& rRequest) } } - - - void Clipboard::DoCut (::Window* pWindow) { if (mrSlideSorter.GetModel().GetPageCount() > 1) @@ -240,9 +226,6 @@ void Clipboard::DoCut (::Window* pWindow) } } - - - void Clipboard::DoDelete (::Window* ) { if (mrSlideSorter.GetModel().GetPageCount() > 1) @@ -251,17 +234,11 @@ void Clipboard::DoDelete (::Window* ) } } - - - void Clipboard::DoCopy (::Window* pWindow ) { CreateSlideTransferable( pWindow, false ); } - - - void Clipboard::DoPaste (::Window* pWindow) { SdTransferable* pClipTransferable = SD_MOD()->pTransferClip; @@ -282,9 +259,6 @@ void Clipboard::DoPaste (::Window* pWindow) } } - - - sal_Int32 Clipboard::GetInsertionPosition (::Window* pWindow) { sal_Int32 nInsertPosition = -1; @@ -325,9 +299,6 @@ sal_Int32 Clipboard::GetInsertionPosition (::Window* pWindow) return nInsertPosition; } - - - sal_Int32 Clipboard::PasteTransferable (sal_Int32 nInsertPosition) { SdTransferable* pClipTransferable = SD_MOD()->pTransferClip; @@ -383,9 +354,6 @@ sal_Int32 Clipboard::PasteTransferable (sal_Int32 nInsertPosition) return nInsertPageCount; } - - - void Clipboard::SelectPageRange (sal_Int32 nFirstIndex, sal_Int32 nPageCount) { // Select the newly inserted pages. That are the nInsertPageCount pages @@ -408,9 +376,6 @@ void Clipboard::SelectPageRange (sal_Int32 nFirstIndex, sal_Int32 nPageCount) } } - - - void Clipboard::CreateSlideTransferable ( ::Window* pWindow, bool bDrag) @@ -504,9 +469,6 @@ void Clipboard::CreateSlideTransferable ( } } - - - ::boost::shared_ptr<SdTransferable::UserData> Clipboard::CreateTransferableUserData (SdTransferable* pTransferable) { do @@ -592,9 +554,6 @@ void Clipboard::CreateSlideTransferable ( return ::boost::shared_ptr<SdTransferable::UserData>(); } - - - void Clipboard::StartDrag ( const Point& rPosition, ::Window* pWindow) @@ -609,9 +568,6 @@ void Clipboard::StartDrag ( InsertionIndicatorHandler::UnknownMode); } - - - void Clipboard::DragFinished (sal_Int8 nDropAction) { if (mnDragFinishedUserEventId == 0) @@ -622,9 +578,6 @@ void Clipboard::DragFinished (sal_Int8 nDropAction) } } - - - IMPL_LINK(Clipboard, ProcessDragFinished, void*, pUserData) { const sal_Int8 nDropAction (static_cast<sal_Int8>(reinterpret_cast<sal_IntPtr>(pUserData))); @@ -658,9 +611,6 @@ IMPL_LINK(Clipboard, ProcessDragFinished, void*, pUserData) return 1; } - - - sal_Int8 Clipboard::AcceptDrop ( const AcceptDropEvent& rEvent, DropTargetHelper& rTargetHelper, @@ -729,9 +679,6 @@ sal_Int8 Clipboard::AcceptDrop ( return nAction; } - - - sal_Int8 Clipboard::ExecuteDrop ( const ExecuteDropEvent& rEvent, DropTargetHelper& rTargetHelper, @@ -836,9 +783,6 @@ sal_Int8 Clipboard::ExecuteDrop ( return nResult; } - - - bool Clipboard::IsInsertionTrivial ( SdTransferable* pTransferable, const sal_Int8 nDndAction) const @@ -851,9 +795,6 @@ bool Clipboard::IsInsertionTrivial ( return mrController.GetInsertionIndicatorHandler()->IsInsertionTrivial(nDndAction); } - - - void Clipboard::Abort (void) { if (mpSelectionObserverContext) @@ -863,9 +804,6 @@ void Clipboard::Abort (void) } } - - - sal_uInt16 Clipboard::DetermineInsertPosition (const SdTransferable& ) { // Tell the model to move the dragged pages behind the one with the @@ -881,9 +819,6 @@ sal_uInt16 Clipboard::DetermineInsertPosition (const SdTransferable& ) return 0; } - - - sal_uInt16 Clipboard::InsertSlides ( const SdTransferable& rTransferable, sal_uInt16 nInsertPosition) @@ -906,9 +841,6 @@ sal_uInt16 Clipboard::InsertSlides ( return nInsertedPageCount; } - - - Clipboard::DropType Clipboard::IsDropAccepted (DropTargetHelper&) const { const SdTransferable* pDragTransferable = SD_MOD()->pTransferDrag; @@ -931,9 +863,6 @@ Clipboard::DropType Clipboard::IsDropAccepted (DropTargetHelper&) const return DT_SHAPE; } - - - sal_Int8 Clipboard::ExecuteOrAcceptShapeDrop ( DropCommand eCommand, const Point& rPosition, @@ -999,8 +928,6 @@ sal_Int8 Clipboard::ExecuteOrAcceptShapeDrop ( return nResult; } - - } } } // end of namespace ::sd::slidesorter::controller /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx index 6e5c3bb196e8..ab4885a33be1 100644 --- a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "SlideSorter.hxx" #include "model/SlideSorterModel.hxx" #include "model/SlsPageDescriptor.hxx" @@ -38,10 +37,8 @@ using namespace ::com::sun::star::uno; using namespace ::sd::slidesorter::model; - namespace sd { namespace slidesorter { namespace controller { - CurrentSlideManager::CurrentSlideManager (SlideSorter& rSlideSorter) : mrSlideSorter(rSlideSorter), mnCurrentSlideIndex(-1), @@ -52,16 +49,10 @@ CurrentSlideManager::CurrentSlideManager (SlideSorter& rSlideSorter) maSwitchPageDelayTimer.SetTimeoutHdl(LINK(this,CurrentSlideManager,SwitchPageCallback)); } - - - CurrentSlideManager::~CurrentSlideManager (void) { } - - - void CurrentSlideManager::NotifyCurrentSlideChange (const SdPage* pPage) { if (pPage != NULL) @@ -74,9 +65,6 @@ void CurrentSlideManager::NotifyCurrentSlideChange (const SdPage* pPage) NotifyCurrentSlideChange(-1); } - - - void CurrentSlideManager::NotifyCurrentSlideChange (const sal_Int32 nSlideIndex) { if (mnCurrentSlideIndex != nSlideIndex) @@ -97,9 +85,6 @@ void CurrentSlideManager::NotifyCurrentSlideChange (const sal_Int32 nSlideIndex) } } - - - void CurrentSlideManager::ReleaseCurrentSlide (void) { if (mpCurrentSlide.get() != NULL) @@ -109,17 +94,11 @@ void CurrentSlideManager::ReleaseCurrentSlide (void) mnCurrentSlideIndex = -1; } - - - bool CurrentSlideManager::IsCurrentSlideIsValid (void) { return mnCurrentSlideIndex >= 0 && mnCurrentSlideIndex<mrSlideSorter.GetModel().GetPageCount(); } - - - void CurrentSlideManager::AcquireCurrentSlide (const sal_Int32 nSlideIndex) { mnCurrentSlideIndex = nSlideIndex; @@ -135,9 +114,6 @@ void CurrentSlideManager::AcquireCurrentSlide (const sal_Int32 nSlideIndex) } } - - - void CurrentSlideManager::SwitchCurrentSlide ( const sal_Int32 nSlideIndex, const bool bUpdateSelection) @@ -145,9 +121,6 @@ void CurrentSlideManager::SwitchCurrentSlide ( SwitchCurrentSlide(mrSlideSorter.GetModel().GetPageDescriptor(nSlideIndex), bUpdateSelection); } - - - void CurrentSlideManager::SwitchCurrentSlide ( const SharedPageDescriptor& rpDescriptor, const bool bUpdateSelection) @@ -192,9 +165,6 @@ void CurrentSlideManager::SwitchCurrentSlide ( } } - - - void CurrentSlideManager::SetCurrentSlideAtViewShellBase (const SharedPageDescriptor& rpDescriptor) { OSL_ASSERT(rpDescriptor.get() != NULL); @@ -213,9 +183,6 @@ void CurrentSlideManager::SetCurrentSlideAtViewShellBase (const SharedPageDescri } } - - - void CurrentSlideManager::SetCurrentSlideAtTabControl (const SharedPageDescriptor& rpDescriptor) { OSL_ASSERT(rpDescriptor.get() != NULL); @@ -233,9 +200,6 @@ void CurrentSlideManager::SetCurrentSlideAtTabControl (const SharedPageDescripto } } - - - void CurrentSlideManager::SetCurrentSlideAtXController (const SharedPageDescriptor& rpDescriptor) { OSL_ASSERT(rpDescriptor.get() != NULL); @@ -260,21 +224,11 @@ void CurrentSlideManager::SetCurrentSlideAtXController (const SharedPageDescript } } - - - - - - - void CurrentSlideManager::PrepareModelChange (void) { mpCurrentSlide.reset(); } - - - void CurrentSlideManager::HandleModelChange (void) { if (mnCurrentSlideIndex >= 0) @@ -285,9 +239,6 @@ void CurrentSlideManager::HandleModelChange (void) } } - - - IMPL_LINK_NOARG(CurrentSlideManager, SwitchPageCallback) { if (mpCurrentSlide) diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx index de382bf74c11..43eb665d2b04 100644 --- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx +++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "SlsDragAndDropContext.hxx" #include "SlideSorter.hxx" @@ -64,25 +63,16 @@ DragAndDropContext::DragAndDropContext (SlideSorter& rSlideSorter) rSlideSorter.GetController().GetInsertionIndicatorHandler()->UpdateIndicatorIcon(pTransferable); } - - - DragAndDropContext::~DragAndDropContext (void) { SetTargetSlideSorter (NULL, Point(0,0), InsertionIndicatorHandler::UnknownMode, false); } - - - void DragAndDropContext::Dispose (void) { mnInsertionIndex = -1; } - - - void DragAndDropContext::UpdatePosition ( const Point& rMousePosition, const InsertionIndicatorHandler::Mode eMode, @@ -119,9 +109,6 @@ void DragAndDropContext::UpdatePosition ( } } - - - void DragAndDropContext::SetTargetSlideSorter ( SlideSorter* pSlideSorter, const Point aMousePosition, @@ -148,7 +135,6 @@ void DragAndDropContext::SetTargetSlideSorter ( } } - } } } // end of namespace ::sd::slidesorter::controller /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx index 16e769377644..6887e7b53e4e 100644 --- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx +++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx @@ -26,13 +26,10 @@ #include "controller/SlsInsertionIndicatorHandler.hxx" #include <vector> - namespace sd { namespace slidesorter { class SlideSorter; } } - - namespace sd { namespace slidesorter { namespace controller { /** A DragAndDropContext object handles an active drag and drop operation. @@ -75,8 +72,6 @@ private: sal_Int32 mnInsertionIndex; }; - - } } } // end of namespace ::sd::slidesorter::controller #endif diff --git a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx index 1d1f295f4752..2147385426a7 100644 --- a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx @@ -45,16 +45,10 @@ FocusManager::FocusManager (SlideSorter& rSlideSorter) mnPageIndex = 0; } - - - FocusManager::~FocusManager (void) { } - - - void FocusManager::MoveFocus (FocusMoveDirection eDirection) { if (mnPageIndex >= 0 && mbPageIsFocused) @@ -159,27 +153,18 @@ void FocusManager::MoveFocus (FocusMoveDirection eDirection) } } - - - void FocusManager::ShowFocus (const bool bScrollToFocus) { mbPageIsFocused = true; ShowFocusIndicator(GetFocusedPageDescriptor(), bScrollToFocus); } - - - void FocusManager::HideFocus (void) { mbPageIsFocused = false; HideFocusIndicator(GetFocusedPageDescriptor()); } - - - bool FocusManager::ToggleFocus (void) { if (mnPageIndex >= 0) @@ -192,27 +177,16 @@ bool FocusManager::ToggleFocus (void) return mbPageIsFocused; } - - - bool FocusManager::HasFocus (void) const { return mrSlideSorter.GetContentWindow()->HasFocus(); } - - - model::SharedPageDescriptor FocusManager::GetFocusedPageDescriptor (void) const { return mrSlideSorter.GetModel().GetPageDescriptor(mnPageIndex); } - - - - - void FocusManager::SetFocusedPage (const model::SharedPageDescriptor& rpDescriptor) { if (rpDescriptor.get() != NULL) @@ -222,34 +196,22 @@ void FocusManager::SetFocusedPage (const model::SharedPageDescriptor& rpDescript } } - - - void FocusManager::SetFocusedPage (sal_Int32 nPageIndex) { FocusHider aFocusHider (*this); mnPageIndex = nPageIndex; } - - - void FocusManager::SetFocusedPageToCurrentPage (void) { SetFocusedPage(mrSlideSorter.GetController().GetCurrentSlideManager()->GetCurrentSlide()); } - - - bool FocusManager::IsFocusShowing (void) const { return HasFocus() && mbPageIsFocused; } - - - void FocusManager::HideFocusIndicator (const model::SharedPageDescriptor& rpDescriptor) { if (rpDescriptor.get() != NULL) @@ -261,9 +223,6 @@ void FocusManager::HideFocusIndicator (const model::SharedPageDescriptor& rpDesc } } - - - void FocusManager::ShowFocusIndicator ( const model::SharedPageDescriptor& rpDescriptor, const bool bScrollToFocus) @@ -284,9 +243,6 @@ void FocusManager::ShowFocusIndicator ( } } - - - void FocusManager::AddFocusChangeListener (const Link& rListener) { if (::std::find (maFocusChangeListeners.begin(), maFocusChangeListeners.end(), rListener) @@ -296,9 +252,6 @@ void FocusManager::AddFocusChangeListener (const Link& rListener) } } - - - void FocusManager::RemoveFocusChangeListener (const Link& rListener) { maFocusChangeListeners.erase ( @@ -319,9 +272,6 @@ void FocusManager::NotifyFocusChangeListeners (void) const } } - - - FocusManager::FocusHider::FocusHider (FocusManager& rManager) : mbFocusVisible(rManager.IsFocusShowing()) , mrManager(rManager) @@ -329,9 +279,6 @@ FocusManager::FocusHider::FocusHider (FocusManager& rManager) mrManager.HideFocus(); } - - - FocusManager::FocusHider::~FocusHider (void) { if (mbFocusVisible) diff --git a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx index c047be13a4c2..fd8dcef357da 100644 --- a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx +++ b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "controller/SlsInsertionIndicatorHandler.hxx" #include "controller/SlsProperties.hxx" #include "view/SlideSorterView.hxx" @@ -33,7 +32,6 @@ using namespace ::com::sun::star::datatransfer::dnd::DNDConstants; namespace sd { namespace slidesorter { namespace controller { - InsertionIndicatorHandler::InsertionIndicatorHandler (SlideSorter& rSlideSorter) : mrSlideSorter(rSlideSorter), mpInsertAnimator(), @@ -49,16 +47,10 @@ InsertionIndicatorHandler::InsertionIndicatorHandler (SlideSorter& rSlideSorter) { } - - - InsertionIndicatorHandler::~InsertionIndicatorHandler (void) { } - - - void InsertionIndicatorHandler::Start (const bool bIsOverSourceView) { if (mbIsActive) @@ -74,9 +66,6 @@ void InsertionIndicatorHandler::Start (const bool bIsOverSourceView) mbIsOverSourceView = bIsOverSourceView; } - - - void InsertionIndicatorHandler::End (const controller::Animator::AnimationMode eMode) { if (mbIsForcedShow || ! mbIsActive || mbIsReadOnly) @@ -92,35 +81,23 @@ void InsertionIndicatorHandler::End (const controller::Animator::AnimationMode e mpInsertionIndicatorOverlay.reset(new view::InsertionIndicatorOverlay(mrSlideSorter)); } - - - void InsertionIndicatorHandler::ForceShow (void) { mbIsForcedShow = true; } - - - void InsertionIndicatorHandler::ForceEnd (void) { mbIsForcedShow = false; End(Animator::AM_Immediate); } - - - void InsertionIndicatorHandler::UpdateIndicatorIcon (const SdTransferable* pTransferable) { mpInsertionIndicatorOverlay->Create(pTransferable); maIconSize = mpInsertionIndicatorOverlay->GetSize(); } - - - InsertionIndicatorHandler::Mode InsertionIndicatorHandler::GetModeFromDndAction ( const sal_Int8 nDndAction) { @@ -132,9 +109,6 @@ InsertionIndicatorHandler::Mode InsertionIndicatorHandler::GetModeFromDndAction return UnknownMode; } - - - void InsertionIndicatorHandler::UpdatePosition ( const Point& rMouseModelPosition, const Mode eMode) @@ -148,9 +122,6 @@ void InsertionIndicatorHandler::UpdatePosition ( SetPosition(rMouseModelPosition, eMode); } - - - void InsertionIndicatorHandler::UpdatePosition ( const Point& rMouseModelPosition, const sal_Int8 nDndAction) @@ -158,13 +129,6 @@ void InsertionIndicatorHandler::UpdatePosition ( UpdatePosition(rMouseModelPosition, GetModeFromDndAction(nDndAction)); } - - - - - - - sal_Int32 InsertionIndicatorHandler::GetInsertionPageIndex (void) const { if (mbIsReadOnly) @@ -173,9 +137,6 @@ sal_Int32 InsertionIndicatorHandler::GetInsertionPageIndex (void) const return maInsertPosition.GetIndex(); } - - - void InsertionIndicatorHandler::SetPosition ( const Point& rPoint, const Mode eMode) @@ -210,9 +171,6 @@ void InsertionIndicatorHandler::SetPosition ( } } - - - ::boost::shared_ptr<view::InsertAnimator> InsertionIndicatorHandler::GetInsertAnimator (void) { if ( ! mpInsertAnimator) @@ -220,9 +178,6 @@ void InsertionIndicatorHandler::SetPosition ( return mpInsertAnimator; } - - - bool InsertionIndicatorHandler::IsInsertionTrivial ( const sal_Int32 nInsertionIndex, const Mode eMode) const @@ -271,17 +226,11 @@ bool InsertionIndicatorHandler::IsInsertionTrivial ( return true; } - - - bool InsertionIndicatorHandler::IsInsertionTrivial (const sal_Int8 nDndAction) { return IsInsertionTrivial(GetInsertionPageIndex(), GetModeFromDndAction(nDndAction)); } - - - //===== InsertionIndicatorHandler::ForceShowContext =========================== InsertionIndicatorHandler::ForceShowContext::ForceShowContext ( @@ -291,9 +240,6 @@ InsertionIndicatorHandler::ForceShowContext::ForceShowContext ( mpHandler->ForceShow(); } - - - InsertionIndicatorHandler::ForceShowContext::~ForceShowContext (void) { mpHandler->ForceEnd(); diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx index af387f3c7928..14ec004a0b2e 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.cxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "SlsListener.hxx" #include "SlideSorter.hxx" @@ -48,7 +47,6 @@ #include <sfx2/viewfrm.hxx> #include <tools/diagnose_ex.h> - using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::uno; @@ -56,7 +54,6 @@ using namespace ::com::sun::star; namespace sd { namespace slidesorter { namespace controller { - Listener::Listener ( SlideSorter& rSlideSorter) : ListenerInterfaceBase(maMutex), @@ -139,18 +136,12 @@ Listener::Listener ( } } - - - Listener::~Listener (void) { DBG_ASSERT( !mbListeningToDocument && !mbListeningToUNODocument && !mbListeningToFrame, "sd::Listener::~Listener(), disposing() was not called, ask DBO!" ); } - - - void Listener::ReleaseListeners (void) { if (mbListeningToDocument) @@ -205,9 +196,6 @@ void Listener::ReleaseListeners (void) } } - - - void Listener::ConnectToController (void) { ViewShell* pShell = mrSlideSorter.GetViewShell(); @@ -253,9 +241,6 @@ void Listener::ConnectToController (void) } } - - - void Listener::DisconnectFromController (void) { if (mbListeningToController) @@ -292,9 +277,6 @@ void Listener::DisconnectFromController (void) } } - - - void Listener::Notify ( SfxBroadcaster& rBroadcaster, const SfxHint& rHint) @@ -367,9 +349,6 @@ void Listener::Notify ( } } - - - IMPL_LINK(Listener, EventMultiplexerCallback, ::sd::tools::EventMultiplexerEvent*, pEvent) { switch (pEvent->meEventId) @@ -385,7 +364,6 @@ IMPL_LINK(Listener, EventMultiplexerCallback, ::sd::tools::EventMultiplexerEvent } break; - case tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED: mbIsMainViewChangePending = true; break; @@ -411,7 +389,6 @@ IMPL_LINK(Listener, EventMultiplexerCallback, ::sd::tools::EventMultiplexerEvent } break; - case tools::EventMultiplexerEvent::EID_CONTROLLER_DETACHED: DisconnectFromController(); break; @@ -437,9 +414,6 @@ IMPL_LINK(Listener, EventMultiplexerCallback, ::sd::tools::EventMultiplexerEvent return 0; } - - - //===== lang::XEventListener ================================================ void SAL_CALL Listener::disposing ( @@ -464,9 +438,6 @@ void SAL_CALL Listener::disposing ( } } - - - //===== document::XEventListener ============================================ void SAL_CALL Listener::notifyEvent ( @@ -475,9 +446,6 @@ void SAL_CALL Listener::notifyEvent ( { } - - - //===== beans::XPropertySetListener ========================================= void SAL_CALL Listener::propertyChange ( @@ -527,9 +495,6 @@ void SAL_CALL Listener::propertyChange ( } } - - - //===== frame::XFrameActionListener ========================================== void SAL_CALL Listener::frameAction (const frame::FrameActionEvent& rEvent) @@ -554,9 +519,6 @@ void SAL_CALL Listener::frameAction (const frame::FrameActionEvent& rEvent) } } - - - //===== accessibility::XAccessibleEventListener ============================== void SAL_CALL Listener::notifyEvent ( @@ -565,17 +527,11 @@ void SAL_CALL Listener::notifyEvent ( { } - - - void SAL_CALL Listener::disposing (void) { ReleaseListeners(); } - - - void Listener::UpdateEditMode (void) { // When there is a new controller then the edit mode may have changed at @@ -601,8 +557,6 @@ void Listener::UpdateEditMode (void) bIsMasterPageMode ? EM_MASTERPAGE : EM_PAGE); } - - void Listener::HandleModelChange (const SdrPage* pPage) { // Notify model and selection observer about the page. The return value @@ -636,8 +590,6 @@ void Listener::HandleModelChange (const SdrPage* pPage) } } - - void Listener::HandleShapeModification (const SdrPage* pPage) { if (pPage == NULL) @@ -679,9 +631,6 @@ void Listener::HandleShapeModification (const SdrPage* pPage) } } - - - void Listener::ThrowIfDisposed (void) throw (::com::sun::star::lang::DisposedException) { @@ -692,9 +641,6 @@ void Listener::ThrowIfDisposed (void) } } - - - } } } // end of namespace ::sd::slidesorter::controller /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/controller/SlsListener.hxx b/sd/source/ui/slidesorter/controller/SlsListener.hxx index 2e17aeca03a5..fe2d018129ca 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.hxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.hxx @@ -46,7 +46,6 @@ namespace sd { namespace slidesorter { class SlideSorter; } } - namespace sd { namespace slidesorter { namespace controller { typedef cppu::WeakComponentImplHelper4< @@ -100,7 +99,6 @@ public: disposing (const ::com::sun::star::lang::EventObject& rEventObject) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //===== document::XEventListener ======================================== virtual void SAL_CALL notifyEvent ( diff --git a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx index c90172c90df2..f397bd5cc345 100644 --- a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx +++ b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "controller/SlsPageSelector.hxx" #include "SlideSorter.hxx" @@ -40,13 +39,11 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <boost/shared_ptr.hpp> - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::sd::slidesorter::model; using namespace ::sd::slidesorter::view; - namespace sd { namespace slidesorter { namespace controller { PageSelector::PageSelector (SlideSorter& rSlideSorter) @@ -65,9 +62,6 @@ PageSelector::PageSelector (SlideSorter& rSlideSorter) CountSelectedPages (); } - - - void PageSelector::SelectAllPages (void) { VisibleAreaManager::TemporaryDisabler aDisabler (mrSlideSorter); @@ -78,9 +72,6 @@ void PageSelector::SelectAllPages (void) SelectPage(nPageIndex); } - - - void PageSelector::DeselectAllPages (void) { VisibleAreaManager::TemporaryDisabler aDisabler (mrSlideSorter); @@ -96,9 +87,6 @@ void PageSelector::DeselectAllPages (void) mpSelectionAnchor.reset(); } - - - void PageSelector::GetCoreSelection (void) { PageSelector::UpdateLock aLock (*this); @@ -130,9 +118,6 @@ void PageSelector::GetCoreSelection (void) } } - - - void PageSelector::SetCoreSelection (void) { model::PageEnumeration aAllPages ( @@ -144,9 +129,6 @@ void PageSelector::SetCoreSelection (void) } } - - - void PageSelector::SelectPage (int nPageIndex) { SharedPageDescriptor pDescriptor (mrModel.GetPageDescriptor(nPageIndex)); @@ -154,9 +136,6 @@ void PageSelector::SelectPage (int nPageIndex) SelectPage(pDescriptor); } - - - void PageSelector::SelectPage (const SdPage* pPage) { const sal_Int32 nPageIndex (mrModel.GetIndex(pPage)); @@ -165,9 +144,6 @@ void PageSelector::SelectPage (const SdPage* pPage) SelectPage(pDescriptor); } - - - void PageSelector::SelectPage (const SharedPageDescriptor& rpDescriptor) { if (rpDescriptor.get()!=NULL @@ -191,9 +167,6 @@ void PageSelector::SelectPage (const SharedPageDescriptor& rpDescriptor) } } - - - void PageSelector::DeselectPage ( int nPageIndex, const bool bUpdateCurrentPage) @@ -203,9 +176,6 @@ void PageSelector::DeselectPage ( DeselectPage(pDescriptor, bUpdateCurrentPage); } - - - void PageSelector::DeselectPage ( const SharedPageDescriptor& rpDescriptor, const bool bUpdateCurrentPage) @@ -229,9 +199,6 @@ void PageSelector::DeselectPage ( } } - - - void PageSelector::CheckConsistency (void) const { int nSelectionCount (0); @@ -252,9 +219,6 @@ void PageSelector::CheckConsistency (void) const } } - - - bool PageSelector::IsPageSelected (int nPageIndex) { SharedPageDescriptor pDescriptor (mrModel.GetPageDescriptor(nPageIndex)); @@ -264,25 +228,11 @@ bool PageSelector::IsPageSelected (int nPageIndex) return false; } - - - int PageSelector::GetPageCount (void) const { return mrModel.GetPageCount(); } - - - - - - - - - - - void PageSelector::CountSelectedPages (void) { mnSelectedPageCount = 0; @@ -295,9 +245,6 @@ void PageSelector::CountSelectedPages (void) } } - - - void PageSelector::EnableBroadcasting (void) { if (mnBroadcastDisableLevel > 0) @@ -309,17 +256,11 @@ void PageSelector::EnableBroadcasting (void) } } - - - void PageSelector::DisableBroadcasting (void) { mnBroadcastDisableLevel ++; } - - - ::boost::shared_ptr<PageSelector::PageSelection> PageSelector::GetPageSelection (void) const { ::boost::shared_ptr<PageSelection> pSelection (new PageSelection()); @@ -336,9 +277,6 @@ void PageSelector::DisableBroadcasting (void) return pSelection; } - - - void PageSelector::SetPageSelection ( const ::boost::shared_ptr<PageSelection>& rpSelection, const bool bUpdateCurrentPage) @@ -350,9 +288,6 @@ void PageSelector::SetPageSelection ( UpdateCurrentPage(); } - - - void PageSelector::UpdateCurrentPage (const bool bUpdateOnlyWhenPending) { if (mnUpdateLockCount > 0) @@ -402,9 +337,6 @@ void PageSelector::UpdateCurrentPage (const bool bUpdateOnlyWhenPending) } } - - - //===== PageSelector::UpdateLock ============================================== PageSelector::UpdateLock::UpdateLock (SlideSorter& rSlideSorter) @@ -413,18 +345,12 @@ PageSelector::UpdateLock::UpdateLock (SlideSorter& rSlideSorter) ++mpSelector->mnUpdateLockCount; } - - - PageSelector::UpdateLock::UpdateLock (PageSelector& rSelector) : mpSelector(&rSelector) { ++mpSelector->mnUpdateLockCount; } - - - PageSelector::UpdateLock::~UpdateLock (void) { Release(); @@ -443,9 +369,6 @@ void PageSelector::UpdateLock::Release (void) } } - - - //===== PageSelector::BroadcastLock ============================================== PageSelector::BroadcastLock::BroadcastLock (SlideSorter& rSlideSorter) @@ -454,18 +377,12 @@ PageSelector::BroadcastLock::BroadcastLock (SlideSorter& rSlideSorter) mrSelector.DisableBroadcasting(); } - - - PageSelector::BroadcastLock::BroadcastLock (PageSelector& rSelector) : mrSelector(rSelector) { mrSelector.DisableBroadcasting(); } - - - PageSelector::BroadcastLock::~BroadcastLock (void) { mrSelector.EnableBroadcasting(); diff --git a/sd/source/ui/slidesorter/controller/SlsProperties.cxx b/sd/source/ui/slidesorter/controller/SlsProperties.cxx index f32d577e8820..5165a5f14de6 100644 --- a/sd/source/ui/slidesorter/controller/SlsProperties.cxx +++ b/sd/source/ui/slidesorter/controller/SlsProperties.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "controller/SlsProperties.hxx" #include <vcl/svapp.hxx> #include <vcl/settings.hxx> @@ -42,16 +41,10 @@ Properties::Properties (void) { } - - - Properties::~Properties (void) { } - - - void Properties::HandleDataChangeEvent (void) { maBackgroundColor = Application::GetSettings().GetStyleSettings().GetWindowColor(); @@ -62,142 +55,61 @@ void Properties::HandleDataChangeEvent (void) = Application::GetSettings().GetStyleSettings().GetHighContrastMode(); } - - - - - - - void Properties::SetHighlightCurrentSlide (const bool bIsHighlightCurrentSlide) { mbIsHighlightCurrentSlide = bIsHighlightCurrentSlide; } - - - - - - - void Properties::SetShowSelection (const bool bIsShowSelection) { mbIsShowSelection = bIsShowSelection; } - - - - - - - void Properties::SetShowFocus (const bool bIsShowFocus) { mbIsShowFocus = bIsShowFocus; } - - - - - - - void Properties::SetCenterSelection (const bool bIsCenterSelection) { mbIsCenterSelection = bIsCenterSelection; } - - - - - - - void Properties::SetSmoothSelectionScrolling (const bool bIsSmoothSelectionScrolling) { mbIsSmoothSelectionScrolling = bIsSmoothSelectionScrolling; } - - - - - - - void Properties::SetSuspendPreviewUpdatesDuringFullScreenPresentation (const bool bFlag) { mbIsSuspendPreviewUpdatesDuringFullScreenPresentation = bFlag; } - - - - - - - void Properties::SetBackgroundColor (const Color& rColor) { maBackgroundColor = rColor; } - - - - - - void Properties::SetTextColor (const Color& rColor) { maTextColor = rColor; } - - - - - - - void Properties::SetSelectionColor (const Color& rColor) { maSelectionColor = rColor; } - - - - - - - void Properties::SetHighlightColor (const Color& rColor) { maHighlightColor = rColor; } - - - - - - - void Properties::SetUIReadOnly (const bool bIsUIReadOnly) { mbIsUIReadOnly = bIsUIReadOnly; } - - - - - } } } // end of namespace ::sd::slidesorter::controller /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx index f1da5e0a16a2..34305272a043 100644 --- a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "controller/SlsScrollBarManager.hxx" #include "SlideSorter.hxx" @@ -67,23 +66,14 @@ ScrollBarManager::ScrollBarManager (SlideSorter& rSlideSorter) LINK(this, ScrollBarManager, AutoScrollTimeoutHandler)); } - - - ScrollBarManager::~ScrollBarManager (void) { } - - - void ScrollBarManager::LateInitialization (void) { } - - - void ScrollBarManager::Connect (void) { if (mpVerticalScrollBar != 0) @@ -98,9 +88,6 @@ void ScrollBarManager::Connect (void) } } - - - void ScrollBarManager::Disconnect (void) { if (mpVerticalScrollBar != 0) @@ -113,9 +100,6 @@ void ScrollBarManager::Disconnect (void) } } - - - /** Placing the scroll bars is an iterative process. The visibility of one scroll bar affects the remaining size and thus may lead to the other scroll bar becoming visible. @@ -149,9 +133,6 @@ Rectangle ScrollBarManager::PlaceScrollBars ( return aRemainingSpace; } - - - void ScrollBarManager::PlaceHorizontalScrollBar (const Rectangle& aAvailableArea) { // Save the current relative position. @@ -171,9 +152,6 @@ void ScrollBarManager::PlaceHorizontalScrollBar (const Rectangle& aAvailableArea (long)(0.5 + mnHorizontalPosition * mpHorizontalScrollBar->GetRange().Len())); } - - - void ScrollBarManager::PlaceVerticalScrollBar (const Rectangle& aArea) { const sal_Int32 nThumbPosition (mpVerticalScrollBar->GetThumbPos()); @@ -189,9 +167,6 @@ void ScrollBarManager::PlaceVerticalScrollBar (const Rectangle& aArea) mnVerticalPosition = nThumbPosition / double(mpVerticalScrollBar->GetRange().Len()); } - - - void ScrollBarManager::PlaceFiller (const Rectangle& aArea) { mpScrollBarFiller->SetPosSizePixel( @@ -203,9 +178,6 @@ void ScrollBarManager::PlaceFiller (const Rectangle& aArea) mpHorizontalScrollBar->GetSizePixel().Height())); } - - - void ScrollBarManager::UpdateScrollBars (bool bResetThumbPosition, bool bUseScrolling) { Rectangle aModelArea (mrSlideSorter.GetView().GetModelArea()); @@ -272,7 +244,6 @@ void ScrollBarManager::UpdateScrollBars (bool bResetThumbPosition, bool bUseScro mnVerticalPosition = 0; } - double nEps (::std::numeric_limits<double>::epsilon()); if (fabs(mnHorizontalPosition-pWindow->GetVisibleX()) > nEps || fabs(mnVerticalPosition-pWindow->GetVisibleY()) > nEps) @@ -285,9 +256,6 @@ void ScrollBarManager::UpdateScrollBars (bool bResetThumbPosition, bool bUseScro } } - - - IMPL_LINK(ScrollBarManager, VerticalScrollBarHandler, ScrollBar*, pScrollBar) { if (pScrollBar!=NULL @@ -304,9 +272,6 @@ IMPL_LINK(ScrollBarManager, VerticalScrollBarHandler, ScrollBar*, pScrollBar) return sal_True; } - - - IMPL_LINK(ScrollBarManager, HorizontalScrollBarHandler, ScrollBar*, pScrollBar) { if (pScrollBar!=NULL @@ -323,9 +288,6 @@ IMPL_LINK(ScrollBarManager, HorizontalScrollBarHandler, ScrollBar*, pScrollBar) return sal_True; } - - - void ScrollBarManager::SetWindowOrigin ( double nHorizontalPosition, double nVerticalPosition) @@ -344,9 +306,6 @@ void ScrollBarManager::SetWindowOrigin ( pWindow->Invalidate (); } - - - /** Determining the visibility of the scroll bars is quite complicated. The visibility of one influences that of the other because showing a scroll bar makes the available space smaller and may lead to the need of @@ -405,9 +364,6 @@ Rectangle ScrollBarManager::DetermineScrollBarVisibilities ( return aRemainingSpace; } - - - bool ScrollBarManager::TestScrollBarVisibilities ( bool bHorizontalScrollBarVisible, bool bVerticalScrollBarVisible, @@ -451,9 +407,6 @@ bool ScrollBarManager::TestScrollBarVisibilities ( return false; } - - - void ScrollBarManager::SetTopLeft (const Point aNewTopLeft) { if (( ! mpVerticalScrollBar @@ -480,9 +433,6 @@ void ScrollBarManager::SetTopLeft (const Point aNewTopLeft) mrSlideSorter.GetView().InvalidatePageObjectVisibilities(); } - - - int ScrollBarManager::GetVerticalScrollBarWidth (void) const { if (mpVerticalScrollBar != 0 && mpVerticalScrollBar->IsVisible()) @@ -491,9 +441,6 @@ int ScrollBarManager::GetVerticalScrollBarWidth (void) const return 0; } - - - int ScrollBarManager::GetHorizontalScrollBarHeight (void) const { if (mpHorizontalScrollBar != 0 && mpHorizontalScrollBar->IsVisible()) @@ -502,9 +449,6 @@ int ScrollBarManager::GetHorizontalScrollBarHeight (void) const return 0; } - - - void ScrollBarManager::CalcAutoScrollOffset (const Point& rMouseWindowPosition) { SharedSdWindow pWindow (mrSlideSorter.GetContentWindow()); @@ -559,9 +503,6 @@ void ScrollBarManager::CalcAutoScrollOffset (const Point& rMouseWindowPosition) maAutoScrollOffset = Size(nDx,nDy); } - - - bool ScrollBarManager::AutoScroll ( const Point& rMouseWindowPosition, const ::boost::function<void(void)>& rAutoScrollFunctor) @@ -575,18 +516,12 @@ bool ScrollBarManager::AutoScroll ( return bResult; } - - - void ScrollBarManager::StopAutoScroll (void) { maAutoScrollTimer.Stop(); mbIsAutoScrollActive = false; } - - - bool ScrollBarManager::RepeatAutoScroll (void) { if (maAutoScrollOffset != Size(0,0)) @@ -625,9 +560,6 @@ IMPL_LINK_NOARG(ScrollBarManager, AutoScrollTimeoutHandler) return 0; } - - - void ScrollBarManager::Scroll( const Orientation eOrientation, const Unit eUnit, @@ -704,7 +636,6 @@ void ScrollBarManager::Scroll( SetTopLeft(aNewTopLeft); } - } } } // end of namespace ::sd::slidesorter::controller /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx index 62963579a93d..85c67010f317 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx @@ -91,8 +91,6 @@ static const sal_uInt32 MODIFIER_MASK (SHIFT_MODIFIER | CONTROL_MODIF } // end of anonymous namespace - - // Define some macros to make the following switch statement more readable. #define ANY_MODIFIER(code) \ code|NO_MODIFIER: \ @@ -138,9 +136,6 @@ private: sal_uInt32 EncodeState (void) const; }; - - - //===== SelectionFunction::ModeHandler ======================================== class SelectionFunction::ModeHandler @@ -192,7 +187,6 @@ private: const bool mbIsMouseOverIndicatorAllowed; }; - /** This is the default handler for processing events. It activates the multi selection or drag-and-drop when the right conditions are met. */ @@ -224,7 +218,6 @@ private: void RangeSelect (const model::SharedPageDescriptor& rpDescriptor); }; - /** Handle events during a multi selection, which typically is started by pressing the left mouse button when not over a page. */ @@ -285,7 +278,6 @@ private: const bool bIsInSelection) const; }; - /** Handle events during drag-and-drop. */ class DragAndDropModeHandler : public SelectionFunction::ModeHandler @@ -317,12 +309,10 @@ private: ::boost::scoped_ptr<DragAndDropContext> mpDragAndDropContext; }; - //===== SelectionFunction ===================================================== TYPEINIT1(SelectionFunction, FuPoor); - SelectionFunction::SelectionFunction ( SlideSorter& rSlideSorter, SfxRequest& rRequest) @@ -342,17 +332,11 @@ SelectionFunction::SelectionFunction ( { } - - - SelectionFunction::~SelectionFunction (void) { mpModeHandler.reset(); } - - - rtl::Reference<FuPoor> SelectionFunction::Create( SlideSorter& rSlideSorter, SfxRequest& rRequest) @@ -361,9 +345,6 @@ rtl::Reference<FuPoor> SelectionFunction::Create( return xFunc; } - - - bool SelectionFunction::MouseButtonDown (const MouseEvent& rEvent) { // remember button state for creation of own MouseEvents @@ -378,18 +359,12 @@ bool SelectionFunction::MouseButtonDown (const MouseEvent& rEvent) return true; } - - - bool SelectionFunction::MouseMove (const MouseEvent& rEvent) { ProcessMouseEvent(MOUSE_MOTION, rEvent); return true; } - - - bool SelectionFunction::MouseButtonUp (const MouseEvent& rEvent) { mrController.GetScrollBarManager().StopAutoScroll (); @@ -402,17 +377,11 @@ bool SelectionFunction::MouseButtonUp (const MouseEvent& rEvent) return true; } - - - void SelectionFunction::NotifyDragFinished (void) { SwitchToNormalMode(); } - - - bool SelectionFunction::KeyInput (const KeyEvent& rEvent) { view::SlideSorterView::DrawLock aDrawLock (mrSlideSorter); @@ -480,7 +449,6 @@ bool SelectionFunction::KeyInput (const KeyEvent& rEvent) } break; - // Move the focus indicator left. case KEY_LEFT: MoveFocus(FocusManager::FMD_LEFT, rCode.IsShift(), rCode.IsMod1()); @@ -558,9 +526,6 @@ bool SelectionFunction::KeyInput (const KeyEvent& rEvent) return bResult; } - - - void SelectionFunction::MoveFocus ( const FocusManager::FocusMoveDirection eDirection, const bool bIsShiftDown, @@ -625,24 +590,16 @@ void SelectionFunction::MoveFocus ( } } - - - void SelectionFunction::Activate() { FuPoor::Activate(); } - - - void SelectionFunction::Deactivate() { FuPoor::Deactivate(); } - - void SelectionFunction::DoCut (void) { if ( ! mrSlideSorter.GetProperties()->IsUIReadOnly()) @@ -651,17 +608,11 @@ void SelectionFunction::DoCut (void) } } - - - void SelectionFunction::DoCopy (void) { mrController.GetClipboard().DoCopy(); } - - - void SelectionFunction::DoPaste (void) { if ( ! mrSlideSorter.GetProperties()->IsUIReadOnly()) @@ -670,18 +621,12 @@ void SelectionFunction::DoPaste (void) } } - - - bool SelectionFunction::cancel (void) { mrController.GetFocusManager().ToggleFocus(); return true; } - - - void SelectionFunction::GotoNextPage (int nOffset) { model::SharedPageDescriptor pDescriptor @@ -696,9 +641,6 @@ void SelectionFunction::GotoNextPage (int nOffset) ResetShiftKeySelectionAnchor(); } - - - void SelectionFunction::GotoPage (int nIndex) { sal_uInt16 nPageCount = (sal_uInt16)mrSlideSorter.GetModel().GetPageCount(); @@ -720,9 +662,6 @@ void SelectionFunction::GotoPage (int nIndex) ResetShiftKeySelectionAnchor(); } - - - void SelectionFunction::ProcessMouseEvent (sal_uInt32 nEventType, const MouseEvent& rEvent) { // #95491# remember button state for creation of own MouseEvents @@ -732,9 +671,6 @@ void SelectionFunction::ProcessMouseEvent (sal_uInt32 nEventType, const MouseEve ProcessEvent(aEventDescriptor); } - - - void SelectionFunction::MouseDragged ( const AcceptDropEvent& rEvent, const sal_Int8 nDragAction) @@ -743,9 +679,6 @@ void SelectionFunction::MouseDragged ( ProcessEvent(aEventDescriptor); } - - - void SelectionFunction::ProcessEvent (EventDescriptor& rDescriptor) { // The call to ProcessEvent may switch to another mode handler. @@ -755,9 +688,6 @@ void SelectionFunction::ProcessEvent (EventDescriptor& rDescriptor) pModeHandler->ProcessEvent(rDescriptor); } - - - bool Match ( const sal_uInt32 nEventCode, const sal_uInt32 nPositivePattern) @@ -765,9 +695,6 @@ bool Match ( return (nEventCode & nPositivePattern)==nPositivePattern; } - - - void SelectionFunction::SwitchToNormalMode (void) { if (mpModeHandler->GetMode() != NormalMode) @@ -775,9 +702,6 @@ void SelectionFunction::SwitchToNormalMode (void) new NormalModeHandler(mrSlideSorter, *this))); } - - - void SelectionFunction::SwitchToDragAndDropMode (const Point aMousePosition) { if (mpModeHandler->GetMode() != DragAndDropMode) @@ -797,9 +721,6 @@ void SelectionFunction::SwitchToDragAndDropMode (const Point aMousePosition) } } - - - void SelectionFunction::SwitchToMultiSelectionMode ( const Point aMousePosition, const sal_uInt32 nEventCode) @@ -820,9 +741,6 @@ void SelectionFunction::SwitchToMultiSelectionMode ( #endif } - - - void SelectionFunction::SwitchMode (const ::boost::shared_ptr<ModeHandler>& rpHandler) { // Not all modes allow mouse over indicator. @@ -839,17 +757,11 @@ void SelectionFunction::SwitchMode (const ::boost::shared_ptr<ModeHandler>& rpHa mpModeHandler = rpHandler; } - - - void SelectionFunction::ResetShiftKeySelectionAnchor (void) { mnShiftKeySelectionAnchor = -1; } - - - void SelectionFunction::ResetMouseAnchor (void) { if (mpModeHandler && mpModeHandler->GetMode() == NormalMode) @@ -861,9 +773,6 @@ void SelectionFunction::ResetMouseAnchor (void) } } - - - //===== EventDescriptor ======================================================= SelectionFunction::EventDescriptor::EventDescriptor ( @@ -897,9 +806,6 @@ SelectionFunction::EventDescriptor::EventDescriptor ( rSlideSorter.GetContentWindow()->GetOutputSizePixel()).IsInside(maMousePosition); } - - - SelectionFunction::EventDescriptor::EventDescriptor ( const sal_uInt32 nEventType, const AcceptDropEvent& rEvent, @@ -931,10 +837,6 @@ SelectionFunction::EventDescriptor::EventDescriptor ( rSlideSorter.GetContentWindow()->GetOutputSizePixel()).IsInside(maMousePosition); } - - - - sal_uInt32 SelectionFunction::EventDescriptor::EncodeMouseEvent ( const MouseEvent& rEvent) const { @@ -981,9 +883,6 @@ sal_uInt32 SelectionFunction::EventDescriptor::EncodeState (void) const return nEventCode; } - - - //===== SelectionFunction::ModeHandler ======================================== SelectionFunction::ModeHandler::ModeHandler ( @@ -996,24 +895,15 @@ SelectionFunction::ModeHandler::ModeHandler ( { } - - - SelectionFunction::ModeHandler::~ModeHandler (void) { } - - - void SelectionFunction::ModeHandler::ReprocessEvent (EventDescriptor& rDescriptor) { mrSelectionFunction.ProcessEvent(rDescriptor); } - - - void SelectionFunction::ModeHandler::ProcessEvent ( SelectionFunction::EventDescriptor& rDescriptor) { @@ -1044,26 +934,17 @@ void SelectionFunction::ModeHandler::ProcessEvent ( HandleUnprocessedEvent(rDescriptor); } - - - bool SelectionFunction::ModeHandler::ProcessButtonDownEvent (EventDescriptor&) { return false; } - - - bool SelectionFunction::ModeHandler::ProcessButtonUpEvent (EventDescriptor&) { mrSelectionFunction.SwitchToNormalMode(); return false; } - - - bool SelectionFunction::ModeHandler::ProcessMotionEvent (EventDescriptor& rDescriptor) { if (mbIsMouseOverIndicatorAllowed) @@ -1080,25 +961,16 @@ bool SelectionFunction::ModeHandler::ProcessMotionEvent (EventDescriptor& rDescr return false; } - - - bool SelectionFunction::ModeHandler::ProcessDragEvent (EventDescriptor&) { return false; } - - - bool SelectionFunction::ModeHandler::HandleUnprocessedEvent (EventDescriptor&) { return false; } - - - void SelectionFunction::ModeHandler::SetCurrentPage ( const model::SharedPageDescriptor& rpDescriptor) { @@ -1106,18 +978,12 @@ void SelectionFunction::ModeHandler::SetCurrentPage ( mrSlideSorter.GetController().GetCurrentSlideManager()->SwitchCurrentSlide(rpDescriptor); } - - - void SelectionFunction::ModeHandler::DeselectAllPages (void) { mrSlideSorter.GetController().GetPageSelector().DeselectAllPages(); mrSelectionFunction.ResetShiftKeySelectionAnchor(); } - - - void SelectionFunction::ModeHandler::SelectOnePage ( const model::SharedPageDescriptor& rpDescriptor) { @@ -1125,9 +991,6 @@ void SelectionFunction::ModeHandler::SelectOnePage ( mrSlideSorter.GetController().GetPageSelector().SelectPage(rpDescriptor); } - - - void SelectionFunction::ModeHandler::SwitchView (const model::SharedPageDescriptor& rpDescriptor) { // Switch to the draw view. This is done only when the current @@ -1148,9 +1011,6 @@ void SelectionFunction::ModeHandler::SwitchView (const model::SharedPageDescript } } - - - void SelectionFunction::ModeHandler::StartDrag ( const Point& rMousePosition, const InsertionIndicatorHandler::Mode eMode) @@ -1170,13 +1030,6 @@ void SelectionFunction::ModeHandler::StartDrag ( } } - - - - - - - //===== NormalModeHandler ===================================================== NormalModeHandler::NormalModeHandler ( @@ -1187,31 +1040,19 @@ NormalModeHandler::NormalModeHandler ( { } - - - NormalModeHandler::~NormalModeHandler (void) { } - - - SelectionFunction::Mode NormalModeHandler::GetMode (void) const { return SelectionFunction::NormalMode; } - - - void NormalModeHandler::Abort (void) { } - - - bool NormalModeHandler::ProcessButtonDownEvent ( SelectionFunction::EventDescriptor& rDescriptor) { @@ -1302,9 +1143,6 @@ bool NormalModeHandler::ProcessButtonDownEvent ( return true; } - - - bool NormalModeHandler::ProcessButtonUpEvent ( SelectionFunction::EventDescriptor& rDescriptor) { @@ -1337,10 +1175,6 @@ bool NormalModeHandler::ProcessButtonUpEvent ( return bIsProcessed; } - - - - bool NormalModeHandler::ProcessMotionEvent ( SelectionFunction::EventDescriptor& rDescriptor) { @@ -1388,9 +1222,6 @@ bool NormalModeHandler::ProcessMotionEvent ( return bIsProcessed; } - - - bool NormalModeHandler::ProcessDragEvent (SelectionFunction::EventDescriptor& rDescriptor) { mrSelectionFunction.SwitchToDragAndDropMode(rDescriptor.maMousePosition); @@ -1398,9 +1229,6 @@ bool NormalModeHandler::ProcessDragEvent (SelectionFunction::EventDescriptor& rD return true; } - - - void NormalModeHandler::RangeSelect (const model::SharedPageDescriptor& rpDescriptor) { PageSelector::UpdateLock aLock (mrSlideSorter); @@ -1432,17 +1260,11 @@ void NormalModeHandler::RangeSelect (const model::SharedPageDescriptor& rpDescri } } - - - void NormalModeHandler::ResetButtonDownLocation (void) { maButtonDownLocation = ::boost::optional<Point>(); } - - - //===== MultiSelectionModeHandler ============================================= MultiSelectionModeHandler::MultiSelectionModeHandler ( @@ -1465,7 +1287,6 @@ MultiSelectionModeHandler::MultiSelectionModeHandler ( #ifndef MACOSX } - void MultiSelectionModeHandler::Initialize(const sal_uInt32 nEventCode) { #endif @@ -1474,10 +1295,6 @@ void MultiSelectionModeHandler::Initialize(const sal_uInt32 nEventCode) SetSelectionModeFromModifier(nEventCode); } - - - - MultiSelectionModeHandler::~MultiSelectionModeHandler (void) { if (mbAutoScrollInstalled) @@ -1489,25 +1306,16 @@ MultiSelectionModeHandler::~MultiSelectionModeHandler (void) mrSlideSorter.GetContentWindow()->SetPointer(maSavedPointer); } - - - SelectionFunction::Mode MultiSelectionModeHandler::GetMode (void) const { return SelectionFunction::MultiSelectionMode; } - - - void MultiSelectionModeHandler::Abort (void) { mrSlideSorter.GetView().RequestRepaint(mrSlideSorter.GetModel().RestoreSelection()); } - - - void MultiSelectionModeHandler::ProcessEvent ( SelectionFunction::EventDescriptor& rDescriptor) { @@ -1521,9 +1329,6 @@ void MultiSelectionModeHandler::ProcessEvent ( ModeHandler::ProcessEvent(rDescriptor); } - - - bool MultiSelectionModeHandler::ProcessButtonUpEvent ( SelectionFunction::EventDescriptor& rDescriptor) { @@ -1544,9 +1349,6 @@ bool MultiSelectionModeHandler::ProcessButtonUpEvent ( return false; } - - - bool MultiSelectionModeHandler::ProcessMotionEvent ( SelectionFunction::EventDescriptor& rDescriptor) { @@ -1562,8 +1364,6 @@ bool MultiSelectionModeHandler::ProcessMotionEvent ( return false; } - - bool MultiSelectionModeHandler::HandleUnprocessedEvent ( SelectionFunction::EventDescriptor& rDescriptor) { @@ -1576,9 +1376,6 @@ bool MultiSelectionModeHandler::HandleUnprocessedEvent ( return true; } - - - void MultiSelectionModeHandler::UpdatePosition ( const Point& rMousePosition, const bool bAllowAutoScroll) @@ -1605,9 +1402,6 @@ void MultiSelectionModeHandler::UpdatePosition ( mbAutoScrollInstalled |= bDoAutoScroll; } - - - void MultiSelectionModeHandler::SetSelectionModeFromModifier ( const sal_uInt32 nEventCode) { @@ -1627,9 +1421,6 @@ void MultiSelectionModeHandler::SetSelectionModeFromModifier ( } } - - - void MultiSelectionModeHandler::SetSelectionMode (const SelectionMode eSelectionMode) { if (meSelectionMode != eSelectionMode) @@ -1639,9 +1430,6 @@ void MultiSelectionModeHandler::SetSelectionMode (const SelectionMode eSelection } } - - - void MultiSelectionModeHandler::UpdateSelectionState ( const model::SharedPageDescriptor& rpDescriptor, const bool bIsInSelection) const @@ -1677,18 +1465,12 @@ void MultiSelectionModeHandler::UpdateSelectionState ( mrSlideSorter.GetController().GetPageSelector().DeselectPage(rpDescriptor); } - - - void MultiSelectionModeHandler::UpdateModelPosition (const Point& rMouseModelPosition) { maSecondCorner = rMouseModelPosition; UpdateSelection(); } - - - void MultiSelectionModeHandler::UpdateSelection (void) { view::SlideSorterView::DrawLock aLock (mrSlideSorter); @@ -1717,9 +1499,6 @@ void MultiSelectionModeHandler::UpdateSelection (void) } } - - - //===== DragAndDropModeHandler ================================================ DragAndDropModeHandler::DragAndDropModeHandler ( @@ -1736,7 +1515,6 @@ DragAndDropModeHandler::DragAndDropModeHandler ( #ifndef MACOSX } - void DragAndDropModeHandler::Initialize(const Point& rMousePosition, ::Window* pWindow) { #endif @@ -1756,9 +1534,6 @@ void DragAndDropModeHandler::Initialize(const Point& rMousePosition, ::Window* p && pDragTransferable->GetView()==&mrSlideSorter.GetView()); } - - - DragAndDropModeHandler::~DragAndDropModeHandler (void) { if (mpDragAndDropContext) @@ -1770,17 +1545,11 @@ DragAndDropModeHandler::~DragAndDropModeHandler (void) mrSlideSorter.GetController().GetInsertionIndicatorHandler()->End(Animator::AM_Animated); } - - - SelectionFunction::Mode DragAndDropModeHandler::GetMode (void) const { return SelectionFunction::DragAndDropMode; } - - - void DragAndDropModeHandler::Abort (void) { mrSlideSorter.GetController().GetClipboard().Abort(); @@ -1789,9 +1558,6 @@ void DragAndDropModeHandler::Abort (void) // mrSlideSorter.GetView().RequestRepaint(mrSlideSorter.GetModel().RestoreSelection()); } - - - bool DragAndDropModeHandler::ProcessButtonUpEvent ( SelectionFunction::EventDescriptor& rDescriptor) { @@ -1807,9 +1573,6 @@ bool DragAndDropModeHandler::ProcessButtonUpEvent ( return false; } - - - bool DragAndDropModeHandler::ProcessDragEvent (SelectionFunction::EventDescriptor& rDescriptor) { OSL_ASSERT(mpDragAndDropContext); @@ -1828,9 +1591,6 @@ bool DragAndDropModeHandler::ProcessDragEvent (SelectionFunction::EventDescripto return true; } - - - } } } // end of namespace ::sd::slidesorter::controller /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx index 08c0a3009d87..0420b378d773 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "controller/SlsSelectionManager.hxx" #include "SlideSorter.hxx" @@ -49,7 +48,6 @@ #include "app.hrc" #include "glob.hrc" - using namespace ::com::sun::star; using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::uno; @@ -59,7 +57,6 @@ using namespace ::sd::slidesorter::controller; namespace sd { namespace slidesorter { namespace controller { - class SelectionManager::PageInsertionListener : public SfxListener { @@ -67,7 +64,6 @@ public: }; - SelectionManager::SelectionManager (SlideSorter& rSlideSorter) : mrSlideSorter(rSlideSorter), mrController(rSlideSorter.GetController()), @@ -81,18 +77,12 @@ SelectionManager::SelectionManager (SlideSorter& rSlideSorter) { } - - - SelectionManager::~SelectionManager (void) { if (mnAnimationId != Animator::NotAnAnimationId) mrController.GetAnimator()->RemoveAnimation(mnAnimationId); } - - - void SelectionManager::DeleteSelectedPages (const bool bSelectFollowingPage) { // Create some locks to prevent updates of the model, view, selection @@ -156,9 +146,6 @@ void SelectionManager::DeleteSelectedPages (const bool bSelectFollowingPage) mrController.GetFocusManager().SetFocusedPage(nNewCurrentSlide); } - - - void SelectionManager::DeleteSelectedNormalPages (const ::std::vector<SdPage*>& rSelectedPages) { // Prepare the deletion via the UNO API. @@ -192,9 +179,6 @@ void SelectionManager::DeleteSelectedNormalPages (const ::std::vector<SdPage*>& } } - - - void SelectionManager::DeleteSelectedMasterPages (const ::std::vector<SdPage*>& rSelectedPages) { // Prepare the deletion via the UNO API. @@ -228,9 +212,6 @@ void SelectionManager::DeleteSelectedMasterPages (const ::std::vector<SdPage*>& } } - - - void SelectionManager::SelectionHasChanged (const bool bMakeSelectionVisible) { if (bMakeSelectionVisible) @@ -270,9 +251,6 @@ void SelectionManager::SelectionHasChanged (const bool bMakeSelectionVisible) } } - - - void SelectionManager::AddSelectionChangeListener (const Link& rListener) { if (::std::find ( @@ -284,9 +262,6 @@ void SelectionManager::AddSelectionChangeListener (const Link& rListener) } } - - - void SelectionManager::RemoveSelectionChangeListener(const Link&rListener) { maSelectionChangeListeners.erase ( @@ -296,9 +271,6 @@ void SelectionManager::RemoveSelectionChangeListener(const Link&rListener) rListener)); } - - - sal_Int32 SelectionManager::GetInsertionPosition (void) const { sal_Int32 nInsertionPosition (mnInsertionPosition); @@ -322,9 +294,6 @@ sal_Int32 SelectionManager::GetInsertionPosition (void) const return nInsertionPosition; } - - - void SelectionManager::SetInsertionPosition (const sal_Int32 nInsertionPosition) { if (nInsertionPosition < 0) @@ -339,10 +308,6 @@ void SelectionManager::SetInsertionPosition (const sal_Int32 nInsertionPosition) mnInsertionPosition = nInsertionPosition; } - - - - } } } // end of namespace ::sd::slidesorter /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx index 743853e244a9..c9288c0021ad 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "SlideSorter.hxx" #include "controller/SlideSorterController.hxx" #include "controller/SlsSelectionManager.hxx" @@ -29,7 +28,6 @@ #include <svx/svdmodel.hxx> #include "drawdoc.hxx" - namespace sd { namespace slidesorter { namespace controller { SelectionObserver::Context::Context (SlideSorter& rSlideSorter) @@ -40,18 +38,12 @@ SelectionObserver::Context::Context (SlideSorter& rSlideSorter) mpSelectionObserver->StartObservation(); } - - - SelectionObserver::Context::~Context(void) { if (mpSelectionObserver) mpSelectionObserver->EndObservation(); } - - - void SelectionObserver::Context::Abort(void) { if (mpSelectionObserver) @@ -61,9 +53,6 @@ void SelectionObserver::Context::Abort(void) } } - - - //===== SelectionObserver ===================================================== SelectionObserver::SelectionObserver (SlideSorter& rSlideSorter) @@ -75,16 +64,10 @@ SelectionObserver::SelectionObserver (SlideSorter& rSlideSorter) { } - - - SelectionObserver::~SelectionObserver (void) { } - - - void SelectionObserver::NotifyPageEvent (const SdrPage* pSdrPage) { if ( ! mbIsOvservationActive) @@ -107,8 +90,6 @@ void SelectionObserver::NotifyPageEvent (const SdrPage* pSdrPage) } } - - void SelectionObserver::StartObservation (void) { OSL_ASSERT(!mbIsOvservationActive); @@ -117,9 +98,6 @@ void SelectionObserver::StartObservation (void) mbIsOvservationActive = true; } - - - void SelectionObserver::AbortObservation (void) { OSL_ASSERT(mbIsOvservationActive); @@ -128,9 +106,6 @@ void SelectionObserver::AbortObservation (void) maDeletedPages.clear(); } - - - void SelectionObserver::EndObservation (void) { OSL_ASSERT(mbIsOvservationActive); @@ -159,8 +134,6 @@ void SelectionObserver::EndObservation (void) } - - } } } // end of namespace ::sd::slidesorter::controller /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index 15f2c7c4be1a..519436020113 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/presentation/XPresentation2.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/uno/Any.hxx> @@ -113,24 +112,16 @@ SlideExclusionState GetSlideExclusionState (model::PageEnumeration& rPageSet); } // end of anonymous namespace - - SlotManager::SlotManager (SlideSorter& rSlideSorter) : mrSlideSorter(rSlideSorter), maCommandQueue() { } - - - SlotManager::~SlotManager (void) { } - - - void SlotManager::FuTemporary (SfxRequest& rRequest) { SdDrawDocument* pDocument = mrSlideSorter.GetModel().GetDocument(); @@ -290,9 +281,6 @@ void SlotManager::FuTemporary (SfxRequest& rRequest) } } - - - void SlotManager::FuPermanent (SfxRequest& rRequest) { ViewShell* pShell = mrSlideSorter.GetViewShell(); @@ -438,9 +426,6 @@ void SlotManager::FuSupport (SfxRequest& rRequest) } } - - - void SlotManager::ExecCtrl (SfxRequest& rRequest) { ViewShell* pViewShell = mrSlideSorter.GetViewShell(); @@ -503,9 +488,6 @@ void SlotManager::ExecCtrl (SfxRequest& rRequest) } } - - - void SlotManager::GetAttrState (SfxItemSet& rSet) { // Iterate over all items. @@ -643,7 +625,6 @@ void SlotManager::GetMenuState (SfxItemSet& rSet) } } - // Disable the rename slots when there are no or more than one slides/master // pages selected; disable the duplicate slot when there are no slides // selected: @@ -692,7 +673,6 @@ void SlotManager::GetMenuState (SfxItemSet& rSet) } } - PageKind ePageKind = mrSlideSorter.GetModel().GetPageType(); if ((eEditMode == EM_MASTERPAGE) && (ePageKind != PK_HANDOUT)) { @@ -714,9 +694,6 @@ void SlotManager::GetMenuState (SfxItemSet& rSet) } } - - - void SlotManager::GetClipboardState ( SfxItemSet& rSet) { SdTransferable* pTransferClip = SD_MOD()->pTransferClip; @@ -836,9 +813,6 @@ void SlotManager::GetClipboardState ( SfxItemSet& rSet) } } - - - void SlotManager::GetStatusBarState (SfxItemSet& rSet) { // page view and layout @@ -1048,9 +1022,6 @@ bool SlotManager::RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const OUStri return bSuccess; } - - - /** Insert a slide. The insertion position depends on a) the selection and b) the mouse position when there is no selection. @@ -1118,9 +1089,6 @@ void SlotManager::InsertSlide (SfxRequest& rRequest) mrSlideSorter.GetController().GetPageSelector().SelectPage(pNewPage); } - - - void SlotManager::DuplicateSelectedSlides (SfxRequest& rRequest) { // Create a list of the pages that are to be duplicated. The process of @@ -1207,9 +1175,6 @@ void SlotManager::ChangeSlideExclusionState ( mrSlideSorter.GetModel().GetDocument()->SetChanged(); } - - - sal_Int32 SlotManager::GetInsertionPosition (void) { PageSelector& rSelector (mrSlideSorter.GetController().GetPageSelector()); @@ -1257,9 +1222,6 @@ sal_Int32 SlotManager::GetInsertionPosition (void) } } - - - void SlotManager::NotifyEditModeChange (void) { SfxBindings& rBindings (mrSlideSorter.GetViewShell()->GetViewFrame()->GetBindings()); @@ -1268,15 +1230,8 @@ void SlotManager::NotifyEditModeChange (void) rBindings.Invalidate(SID_DUPLICATE_PAGE); } - - - - - namespace { - - SlideExclusionState GetSlideExclusionState (model::PageEnumeration& rPageSet) { SlideExclusionState eState (UNDEFINED); diff --git a/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx b/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx index ca5a6a7ef7e5..a3d7a5fc309b 100644 --- a/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx +++ b/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "controller/SlsTransferableData.hxx" #include "SlideSorterViewShell.hxx" @@ -63,18 +62,12 @@ TransferableData::TransferableData ( StartListening(*mpViewShell); } - - - TransferableData::~TransferableData (void) { if (mpViewShell != NULL) EndListening(*mpViewShell); } - - - void TransferableData::DragFinished (sal_Int8 nDropAction) { if (mpViewShell != NULL) @@ -93,9 +86,6 @@ void TransferableData::DragFinished (sal_Int8 nDropAction) */ } - - - void TransferableData::Notify (SfxBroadcaster&, const SfxHint& rHint) { if (rHint.ISA(SfxSimpleHint) && mpViewShell!=NULL) @@ -113,14 +103,6 @@ void TransferableData::Notify (SfxBroadcaster&, const SfxHint& rHint) } } - - - - - - - - } } } // end of namespace ::sd::slidesorter::controller /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx index e4135045f369..a008fa1b91ab 100644 --- a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx @@ -28,7 +28,6 @@ #include "controller/SlsScrollBarManager.hxx" #include "controller/SlsCurrentSlideManager.hxx" - namespace sd { namespace slidesorter { namespace controller { namespace { @@ -49,8 +48,6 @@ namespace { } // end of anonymous namespace - - VisibleAreaManager::VisibleAreaManager (SlideSorter& rSlideSorter) : mrSlideSorter(rSlideSorter), maVisibleRequests(), @@ -62,36 +59,20 @@ VisibleAreaManager::VisibleAreaManager (SlideSorter& rSlideSorter) { } - - - VisibleAreaManager::~VisibleAreaManager (void) { } - - - void VisibleAreaManager::ActivateCurrentSlideTracking (void) { mbIsCurrentSlideTrackingActive = true; } - - - void VisibleAreaManager::DeactivateCurrentSlideTracking (void) { mbIsCurrentSlideTrackingActive = false; } - - - - - - - void VisibleAreaManager::RequestVisible ( const model::SharedPageDescriptor& rpDescriptor, const bool bForce) @@ -111,9 +92,6 @@ void VisibleAreaManager::RequestVisible ( } } - - - void VisibleAreaManager::RequestCurrentSlideVisible (void) { if (mbIsCurrentSlideTrackingActive && mnDisableCount==0) @@ -121,9 +99,6 @@ void VisibleAreaManager::RequestCurrentSlideVisible (void) mrSlideSorter.GetController().GetCurrentSlideManager()->GetCurrentSlide()); } - - - void VisibleAreaManager::MakeVisible (void) { if (maVisibleRequests.empty()) @@ -171,9 +146,6 @@ void VisibleAreaManager::MakeVisible (void) meRequestedAnimationMode = Animator::AM_Immediate; } - - - ::boost::optional<Point> VisibleAreaManager::GetRequestedTopLeft (void) const { SharedSdWindow pWindow (mrSlideSorter.GetContentWindow()); @@ -228,9 +200,6 @@ void VisibleAreaManager::MakeVisible (void) return ::boost::optional<Point>(aRequestedTopLeft); } - - - //===== VisibleAreaManager::TemporaryDisabler ================================= VisibleAreaManager::TemporaryDisabler::TemporaryDisabler (SlideSorter& rSlideSorter) @@ -239,16 +208,11 @@ VisibleAreaManager::TemporaryDisabler::TemporaryDisabler (SlideSorter& rSlideSor ++mrVisibleAreaManager.mnDisableCount; } - - - VisibleAreaManager::TemporaryDisabler::~TemporaryDisabler (void) { --mrVisibleAreaManager.mnDisableCount; } - - //===== VerticalVisibleAreaScroller =========================================== namespace { @@ -285,9 +249,6 @@ VisibleAreaScroller::VisibleAreaScroller ( } } - - - void VisibleAreaScroller::operator() (const double nTime) { const double nLocalTime (maAccelerationFunction(nTime)); diff --git a/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx b/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx index 35c6b1cceb0a..568b6eb4ee75 100644 --- a/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx +++ b/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx @@ -33,7 +33,6 @@ namespace sd { namespace slidesorter { namespace cache { class BitmapCache; - /** Provide and manage the preview bitmap caches for all slide sorter instances. There is one cache per active slide sorter plus a small number of caches that are no longer in use. The later are kept to speed diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx index d056b5a8b00c..a86b5fa4f809 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx @@ -153,7 +153,6 @@ public: }; friend class ModelChangeLock; - /** Handle a change of the model, that is, handle the removal and insertion of whole pages or a change of the edit mode. diff --git a/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx index da1f8d73a990..dfeb851664ba 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx @@ -30,8 +30,6 @@ namespace sd { namespace slidesorter { namespace view { class SlideSorterView; } } } - - namespace sd { namespace slidesorter { namespace controller { class AnimationBezierFunction @@ -59,9 +57,6 @@ private: const double nV2); }; - - - /** Turn a parametric function into one whose y-Values depend on its x-Values. Note a lot of interpolation takes place. The resulting accuracy should be good enough for the purpose of acceleration @@ -82,9 +77,6 @@ private: ::std::vector<double> maY; }; - - - } } } // end of namespace ::sd::slidesorter::controller #endif diff --git a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx index 927dcd2fb847..9d177f70e050 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx @@ -31,7 +31,6 @@ #include <boost/scoped_ptr.hpp> #include <boost/shared_ptr.hpp> - namespace sd { namespace slidesorter { namespace controller { /** Experimental class for simple eye candy animations. @@ -86,7 +85,6 @@ public: */ void RemoveAnimation (const AnimationId nAnimationId); - /** A typical use case for this method is the temporary shutdown of the slidesorter when the slide sorter bar is put into a cache due to a change of the edit mode. @@ -124,7 +122,6 @@ private: void RequestNextFrame (const double nFrameStart = 0); }; - } } } // end of namespace ::sd::slidesorter::controller #endif diff --git a/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx index 3e73a45d3dc8..8f767c198a93 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx @@ -31,7 +31,6 @@ namespace sd { namespace slidesorter { class SlideSorter; } } - namespace sd { namespace slidesorter { namespace controller { /** Manage the current slide. This includes setting the according flags at @@ -114,7 +113,6 @@ private: DECL_LINK(SwitchPageCallback,void*); }; - } } } // end of namespace ::sd::slidesorter::controller #endif diff --git a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx index 881567e87868..12284bae8db3 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx @@ -30,7 +30,6 @@ namespace sd { namespace slidesorter { class SlideSorter; } } - namespace sd { namespace slidesorter { namespace controller { /** This class manages the focus of the slide sorter. There is the focus diff --git a/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx b/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx index 75953a49046d..b094c447fee6 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx @@ -25,19 +25,16 @@ #include "view/SlsLayouter.hxx" #include "sdxfer.hxx" - namespace sd { namespace slidesorter { class SlideSorter; } } namespace sd { namespace slidesorter { namespace view { class InsertAnimator; class InsertionIndicatorOverlay; } } } - namespace sd { namespace slidesorter { namespace controller { class Transferable; - /** Manage the visibility and location of the insertion indicator. Its actual display is controlled by the InsertionIndicatorOverlay. */ @@ -138,7 +135,6 @@ private: void ForceEnd (void); }; - } } } // end of namespace ::sd::slidesorter::controller #endif diff --git a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx index 78be1d40a931..aca8fafe4db5 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx @@ -27,7 +27,6 @@ #include <memory> #include <boost/noncopyable.hpp> - class SdPage; namespace sd { namespace slidesorter { @@ -42,7 +41,6 @@ namespace sd { namespace slidesorter { namespace controller { class SlideSorterController; - /** A sub-controller that handles page selection of the slide browser. Selecting a page does not make it the current page (of the main view) automatically as this would not be desired in a multi selection. This @@ -118,7 +116,6 @@ public: */ model::SharedPageDescriptor GetSelectionAnchor (void) const { return mpSelectionAnchor;} - typedef ::std::vector<SdPage*> PageSelection; /** Return an object that describes the current selection. The caller diff --git a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx index 5aac260c2d61..5c6f4ed494d4 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx @@ -111,7 +111,6 @@ public: */ bool IsOnlyPreviewTriggersMouseOver (void) const { return mbIsOnlyPreviewTriggersMouseOver;} - private: bool mbIsHighlightCurrentSlide; bool mbIsShowSelection; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx index cfc9c0eb30be..66d24d22a0eb 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx @@ -40,7 +40,6 @@ namespace sd { namespace slidesorter { class SlideSorter; } } - namespace sd { namespace slidesorter { namespace controller { /** Manage the horizontal and vertical scroll bars. Listen for events, set diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx index b400dff8f041..8128b6b14301 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx @@ -36,7 +36,6 @@ namespace sd { namespace slidesorter { namespace controller { class SlideSorterController; - class SelectionFunction : public FuPoor, private ::boost::noncopyable diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx index 6ab8db2d1d60..b8841a798465 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx @@ -31,7 +31,6 @@ namespace sd { namespace slidesorter { class SlideSorter; } } - namespace sd { namespace slidesorter { namespace controller { class Command; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx index 62c1ea3b14e2..b062c7a494c8 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx @@ -27,7 +27,6 @@ namespace sd { namespace slidesorter { namespace controller { - /** Manage requests for scrolling page objects into view. */ class VisibleAreaManager @@ -87,7 +86,6 @@ private: ::boost::optional<Point> GetRequestedTopLeft (void) const; }; - } } } // end of namespace ::sd::slidesorter::view #endif diff --git a/sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx b/sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx index 1e921ca73228..546745c38988 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx @@ -24,7 +24,6 @@ namespace sd { namespace slidesorter { namespace model { - /** Interface to generic enumerations. Designed to operate on shared pointers. Therefore GetNextElement() returns T and not T&. */ diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx index d8121cd6e2e5..2bcb359308c2 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx @@ -28,7 +28,6 @@ #include <boost/enable_shared_from_this.hpp> - class SdPage; class SdrPage; @@ -136,7 +135,6 @@ private: bool mbIsMouseOver : 1; bool mbHasTransition : 1; - // Do not use the copy constructor operator. It is not implemented. PageDescriptor (const PageDescriptor& rDescriptor); diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx index 2957303696ee..6f812c2a9822 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx @@ -34,7 +34,6 @@ namespace sd { namespace slidesorter { namespace model { class SlideSorterModel; - /** Public class of page enumerations that delegates its calls to an implementation object that can filter pages by using a given predicate. diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx index 85d9c109cdb8..292405f42725 100644 --- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx @@ -60,7 +60,6 @@ class PageObjectPainter; class SelectionPainter; class ToolTip; - class SlideSorterView : public sd::View, public ::boost::noncopyable @@ -271,7 +270,6 @@ private: void Rearrange (void); }; - } } } // end of namespace ::sd::slidesorter::view #endif diff --git a/sd/source/ui/slidesorter/inc/view/SlsILayerPainter.hxx b/sd/source/ui/slidesorter/inc/view/SlsILayerPainter.hxx index e6709edd62e3..20d524c8beec 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsILayerPainter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsILayerPainter.hxx @@ -50,7 +50,6 @@ public: }; typedef ::boost::shared_ptr<ILayerPainter> SharedILayerPainter; - } } } // end of namespace ::sd::slidesorter::view #endif diff --git a/sd/source/ui/slidesorter/inc/view/SlsInsertAnimator.hxx b/sd/source/ui/slidesorter/inc/view/SlsInsertAnimator.hxx index fe37b6287bf8..344232805586 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsInsertAnimator.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsInsertAnimator.hxx @@ -28,7 +28,6 @@ namespace sd { namespace slidesorter { namespace view { class InsertPosition; - /** Animate the positions of page objects to make room at the insert position while a move or copy operation takes place. */ @@ -57,7 +56,6 @@ private: ::boost::shared_ptr<Implementation> mpImplementation; }; - } } } // end of namespace ::sd::slidesorter::view #endif diff --git a/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx b/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx index 15262e33e014..4479aaa2fd3c 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx @@ -108,8 +108,6 @@ private: const sal_Int32 nSelectionCount); }; - - } } } // end of namespace ::sd::slidesorter::view #endif diff --git a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx index 6add4e70bf4e..381bac6868f7 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx @@ -29,15 +29,12 @@ #include <vector> #include <utility> - class Size; namespace sd { namespace slidesorter { namespace view { class InsertPosition; - - /** Calculate the size and position of page objects displayed by a slide sorter. The layouter takes into account various input values: 1.) Size of the window in which the slide sorter is displayed. @@ -198,10 +195,6 @@ private: SharedSdWindow mpWindow; }; - - - - /** Collect all values concerning the logical and visual properties of the insertion position that is used for drag-and-drop and copy-and-past. */ @@ -247,8 +240,6 @@ private: Point maTrailingOffset; }; - - } } } // end of namespace ::sd::slidesorter::view #endif diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx index a54e1328ee12..d4070714e45a 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx @@ -27,7 +27,6 @@ namespace sd { namespace slidesorter { namespace view { - /** In contrast to the Layouter that places page objects in the view, the PageObjectLayouter places the parts of individual page objects like page number area, borders, preview. @@ -144,7 +143,6 @@ private: const sal_Int32 nFocusIndicatorWidth); }; - } } } // end of namespace ::sd::slidesorter::view #endif diff --git a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx index 55188af841f2..c0decd7a34c7 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx @@ -30,7 +30,6 @@ #include <boost/shared_ptr.hpp> #include <boost/weak_ptr.hpp> - namespace sd { namespace slidesorter { namespace controller { class Properties; } } } @@ -149,7 +148,6 @@ private: void InitializeIcon (const IconType eType, sal_uInt16 nResourceId); }; - } } } // end of namespace ::sd::slidesorter::view #endif diff --git a/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx b/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx index 52b9fa464d47..ab04aba70efe 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx @@ -71,7 +71,6 @@ private: DECL_LINK(DelayTrigger, void*); }; - } } } // end of namespace ::sd::slidesorter::view #endif diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx index 27dbdd71e8c3..6ce44a2c90ba 100644 --- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx +++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "model/SlideSorterModel.hxx" #include "SlideSorter.hxx" @@ -101,9 +100,6 @@ namespace { } } - - - SlideSorterModel::SlideSorterModel (SlideSorter& rSlideSorter) : maMutex(), mrSlideSorter(rSlideSorter), @@ -114,32 +110,20 @@ SlideSorterModel::SlideSorterModel (SlideSorter& rSlideSorter) { } - - - SlideSorterModel::~SlideSorterModel (void) { ClearDescriptorList (); } - - - void SlideSorterModel::Init (void) { } - - - void SlideSorterModel::Dispose (void) { ClearDescriptorList (); } - - - SdDrawDocument* SlideSorterModel::GetDocument (void) { if (mrSlideSorter.GetViewShellBase() != NULL) @@ -148,9 +132,6 @@ SdDrawDocument* SlideSorterModel::GetDocument (void) return NULL; } - - - bool SlideSorterModel::SetEditMode (EditMode eEditMode) { bool bEditModeChanged = false; @@ -163,25 +144,11 @@ bool SlideSorterModel::SetEditMode (EditMode eEditMode) return bEditModeChanged; } - - - - - - - - - - - sal_Int32 SlideSorterModel::GetPageCount (void) const { return maPageDescriptors.size(); } - - - SharedPageDescriptor SlideSorterModel::GetPageDescriptor ( const sal_Int32 nPageIndex, const bool bCreate) const @@ -207,9 +174,6 @@ SharedPageDescriptor SlideSorterModel::GetPageDescriptor ( return pDescriptor; } - - - sal_Int32 SlideSorterModel::GetIndex (const Reference<drawing::XDrawPage>& rxSlide) const { ::osl::MutexGuard aGuard (maMutex); @@ -259,9 +223,6 @@ sal_Int32 SlideSorterModel::GetIndex (const Reference<drawing::XDrawPage>& rxSli return -1; } - - - sal_Int32 SlideSorterModel::GetIndex (const SdrPage* pPage) const { if (pPage == NULL) @@ -300,9 +261,6 @@ sal_Int32 SlideSorterModel::GetIndex (const SdrPage* pPage) const return -1; } - - - sal_uInt16 SlideSorterModel::GetCoreIndex (const sal_Int32 nIndex) const { SharedPageDescriptor pDescriptor (GetPageDescriptor(nIndex)); @@ -312,9 +270,6 @@ sal_uInt16 SlideSorterModel::GetCoreIndex (const sal_Int32 nIndex) const return mxSlides->getCount()*2+1; } - - - /** For now this method uses a trivial algorithm: throw away all descriptors and create them anew (on demand). The main problem that we are facing when designing a better algorithm is that we can not compare pointers to @@ -360,9 +315,6 @@ void SlideSorterModel::Resync (void) CheckModel(*this); } - - - void SlideSorterModel::ClearDescriptorList (void) { DescriptorContainer aDescriptors; @@ -389,9 +341,6 @@ void SlideSorterModel::ClearDescriptorList (void) } } - - - void SlideSorterModel::SynchronizeDocumentSelection (void) { ::osl::MutexGuard aGuard (maMutex); @@ -405,9 +354,6 @@ void SlideSorterModel::SynchronizeDocumentSelection (void) } } - - - void SlideSorterModel::SynchronizeModelSelection (void) { ::osl::MutexGuard aGuard (maMutex); @@ -421,13 +367,6 @@ void SlideSorterModel::SynchronizeModelSelection (void) } } - - - - - - - void SlideSorterModel::SetDocumentSlides ( const Reference<container::XIndexAccess>& rxSlides) { @@ -485,18 +424,12 @@ void SlideSorterModel::SetDocumentSlides ( mrSlideSorter.GetController().GetSlotManager()->NotifyEditModeChange(); } - - - Reference<container::XIndexAccess> SlideSorterModel::GetDocumentSlides (void) const { ::osl::MutexGuard aGuard (maMutex); return mxSlides; } - - - void SlideSorterModel::UpdatePageList (void) { ::osl::MutexGuard aGuard (maMutex); @@ -543,9 +476,6 @@ void SlideSorterModel::UpdatePageList (void) mrSlideSorter.GetController().SetDocumentSlides(xPages); } - - - void SlideSorterModel::AdaptSize (void) { if (mxSlides.is()) @@ -554,9 +484,6 @@ void SlideSorterModel::AdaptSize (void) maPageDescriptors.resize(0); } - - - bool SlideSorterModel::IsReadOnly (void) const { if (mrSlideSorter.GetViewShellBase() != NULL @@ -566,9 +493,6 @@ bool SlideSorterModel::IsReadOnly (void) const return true; } - - - void SlideSorterModel::SaveCurrentSelection (void) { PageEnumeration aPages (PageEnumerationProvider::CreateAllPagesEnumeration(*this)); @@ -581,9 +505,6 @@ void SlideSorterModel::SaveCurrentSelection (void) } } - - - Region SlideSorterModel::RestoreSelection (void) { Region aRepaintRegion; @@ -601,9 +522,6 @@ Region SlideSorterModel::RestoreSelection (void) return aRepaintRegion; } - - - bool SlideSorterModel::NotifyPageEvent (const SdrPage* pSdrPage) { ::osl::MutexGuard aGuard (maMutex); @@ -628,9 +546,6 @@ bool SlideSorterModel::NotifyPageEvent (const SdrPage* pSdrPage) return true; } - - - void SlideSorterModel::InsertSlide (SdPage* pPage) { // Find the index at which to insert the given page. @@ -661,9 +576,6 @@ void SlideSorterModel::InsertSlide (SdPage* pPage) UpdateIndices(nIndex+1); } - - - void SlideSorterModel::DeleteSlide (const SdPage* pPage) { sal_Int32 nIndex(0); @@ -698,9 +610,6 @@ void SlideSorterModel::DeleteSlide (const SdPage* pPage) } } - - - void SlideSorterModel::UpdateIndices (const sal_Int32 nFirstIndex) { for (sal_Int32 nDescriptorIndex=0,nCount=maPageDescriptors.size(); @@ -725,9 +634,6 @@ void SlideSorterModel::UpdateIndices (const sal_Int32 nFirstIndex) } } - - - SdPage* SlideSorterModel::GetPage (const sal_Int32 nSdIndex) const { SdDrawDocument* pModel = const_cast<SlideSorterModel*>(this)->GetDocument(); @@ -742,7 +648,6 @@ SdPage* SlideSorterModel::GetPage (const sal_Int32 nSdIndex) const return NULL; } - } } } // end of namespace ::sd::slidesorter::model /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx index bbe6488f1a25..e8e377c7e026 100644 --- a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx +++ b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "model/SlsPageDescriptor.hxx" #include "sdpage.hxx" @@ -33,7 +32,6 @@ using namespace ::com::sun::star; namespace sd { namespace slidesorter { namespace model { - PageDescriptor::PageDescriptor ( const Reference<drawing::XDrawPage>& rxPage, SdPage* pPage, @@ -63,37 +61,16 @@ PageDescriptor::PageDescriptor ( } } - - - PageDescriptor::~PageDescriptor (void) { } - - - - - - - - - - - - - - - void PageDescriptor::SetPageIndex (const sal_Int32 nNewIndex) { mnIndex = nNewIndex; maVisualState.mnPageId = nNewIndex; } - - - bool PageDescriptor::UpdateMasterPage (void) { const SdrPage* pMaster = NULL; @@ -108,9 +85,6 @@ bool PageDescriptor::UpdateMasterPage (void) return false; } - - - bool PageDescriptor::UpdateTransitionFlag (void) { bool bHasSlideTransition (false); @@ -125,9 +99,6 @@ bool PageDescriptor::UpdateTransitionFlag (void) return false; } - - - bool PageDescriptor::HasState (const State eState) const { switch (eState) @@ -159,9 +130,6 @@ bool PageDescriptor::HasState (const State eState) const } } - - - bool PageDescriptor::SetState (const State eState, const bool bNewStateValue) { bool bModified (false); @@ -220,13 +188,6 @@ bool PageDescriptor::SetState (const State eState, const bool bNewStateValue) return bModified; } - - - - - - - bool PageDescriptor::GetCoreSelection (void) { if (mpPage!=NULL && mpPage->IsSelected() != mbIsSelected) @@ -235,9 +196,6 @@ bool PageDescriptor::GetCoreSelection (void) return false; } - - - void PageDescriptor::SetCoreSelection (void) { if (mpPage != NULL) @@ -251,9 +209,6 @@ void PageDescriptor::SetCoreSelection (void) } } - - - Rectangle PageDescriptor::GetBoundingBox (void) const { Rectangle aBox (maBoundingBox); @@ -262,9 +217,6 @@ Rectangle PageDescriptor::GetBoundingBox (void) const return aBox; } - - - Point PageDescriptor::GetLocation (const bool bIgnoreOffset) const { if (bIgnoreOffset) @@ -273,16 +225,11 @@ Point PageDescriptor::GetLocation (const bool bIgnoreOffset) const return maBoundingBox.TopLeft() + maVisualState.GetLocationOffset(); } - - - void PageDescriptor::SetBoundingBox (const Rectangle& rBoundingBox) { maBoundingBox = rBoundingBox; } - - } } } // end of namespace ::sd::slidesorter::model /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx index 71846823fe05..f0086e7a871e 100644 --- a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx +++ b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx @@ -69,9 +69,6 @@ private: } // end of anonymouse namespace - - - namespace sd { namespace slidesorter { namespace model { SAL_WNODEPRECATED_DECLARATIONS_PUSH @@ -84,7 +81,6 @@ PageEnumeration PageEnumeration::Create ( } SAL_WNODEPRECATED_DECLARATIONS_POP - SAL_WNODEPRECATED_DECLARATIONS_PUSH PageEnumeration::PageEnumeration ( ::std::auto_ptr<Enumeration<SharedPageDescriptor> > pImpl) @@ -93,8 +89,6 @@ PageEnumeration::PageEnumeration ( } SAL_WNODEPRECATED_DECLARATIONS_POP - - PageEnumeration::PageEnumeration ( PageEnumeration& rEnumeration, bool bCloneImpl) @@ -110,25 +104,16 @@ PageEnumeration::PageEnumeration ( } } - - - PageEnumeration::PageEnumeration (const PageEnumeration& rEnumeration ) : sd::slidesorter::model::Enumeration<sd::slidesorter::model::SharedPageDescriptor>() { mpImpl = rEnumeration.mpImpl->Clone(); } - - - PageEnumeration::~PageEnumeration (void) { } - - - PageEnumeration& PageEnumeration::operator= ( const PageEnumeration& rEnumeration) { @@ -136,8 +121,6 @@ PageEnumeration& PageEnumeration::operator= ( return *this; } - - SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<Enumeration<SharedPageDescriptor> > PageEnumeration::Clone (void) { @@ -146,23 +129,16 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH } SAL_WNODEPRECATED_DECLARATIONS_POP - - bool PageEnumeration::HasMoreElements (void) const { return mpImpl->HasMoreElements(); } - - SharedPageDescriptor PageEnumeration::GetNextElement (void) { return mpImpl->GetNextElement(); } - - - void PageEnumeration::Rewind (void) { return mpImpl->Rewind(); @@ -170,9 +146,6 @@ void PageEnumeration::Rewind (void) } } } // end of namespace ::sd::slidesorter::model - - - namespace { PageEnumerationImpl::PageEnumerationImpl ( @@ -185,9 +158,6 @@ PageEnumerationImpl::PageEnumerationImpl ( Rewind(); } - - - PageEnumerationImpl::PageEnumerationImpl ( const SlideSorterModel& rModel, const PageEnumeration::PagePredicate& rPredicate, @@ -198,15 +168,10 @@ PageEnumerationImpl::PageEnumerationImpl ( { } - - - PageEnumerationImpl::~PageEnumerationImpl (void) { } - - SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<Enumeration<SharedPageDescriptor> > PageEnumerationImpl::Clone (void) @@ -216,16 +181,11 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH } SAL_WNODEPRECATED_DECLARATIONS_POP - - bool PageEnumerationImpl::HasMoreElements (void) const { return (mnIndex < mrModel.GetPageCount()); } - - - SharedPageDescriptor PageEnumerationImpl::GetNextElement (void) { SharedPageDescriptor pDescriptor (mrModel.GetPageDescriptor(mnIndex)); @@ -237,9 +197,6 @@ SharedPageDescriptor PageEnumerationImpl::GetNextElement (void) return pDescriptor; } - - - void PageEnumerationImpl::Rewind (void) { // Go to first valid element. @@ -247,10 +204,6 @@ void PageEnumerationImpl::Rewind (void) AdvanceToNextValidElement(); } - - - - void PageEnumerationImpl::AdvanceToNextValidElement (void) { while (mnIndex < mrModel.GetPageCount()) diff --git a/sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx b/sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx index ab2b21dd7dd6..fafeb9c21d21 100644 --- a/sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx +++ b/sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "model/SlsPageEnumerationProvider.hxx" #include "model/SlsPageEnumeration.hxx" #include "model/SlsPageDescriptor.hxx" @@ -25,7 +24,6 @@ namespace sd { namespace slidesorter { namespace model { - namespace { class AllPagesPredicate @@ -38,10 +36,6 @@ public: } }; - - - - class SelectedPagesPredicate { public: @@ -51,9 +45,6 @@ public: } }; - - - class VisiblePagesPredicate { public: @@ -65,18 +56,12 @@ public: } - - - PageEnumeration PageEnumerationProvider::CreateAllPagesEnumeration ( const SlideSorterModel& rModel) { return PageEnumeration::Create(rModel, AllPagesPredicate()); } - - - PageEnumeration PageEnumerationProvider::CreateSelectedPagesEnumeration ( const SlideSorterModel& rModel) { @@ -85,9 +70,6 @@ PageEnumeration PageEnumerationProvider::CreateSelectedPagesEnumeration ( SelectedPagesPredicate()); } - - - PageEnumeration PageEnumerationProvider::CreateVisiblePagesEnumeration ( const SlideSorterModel& rModel) { @@ -96,7 +78,6 @@ PageEnumeration PageEnumerationProvider::CreateVisiblePagesEnumeration ( VisiblePagesPredicate()); } - } } } // end of namespace ::sd::slidesorter::model /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/model/SlsVisualState.cxx b/sd/source/ui/slidesorter/model/SlsVisualState.cxx index 28c85d0a6920..ef3a58708723 100644 --- a/sd/source/ui/slidesorter/model/SlsVisualState.cxx +++ b/sd/source/ui/slidesorter/model/SlsVisualState.cxx @@ -49,7 +49,6 @@ void VisualState::SetVisualState (const State eState) meCurrentVisualState = eState; } - void VisualState::UpdateVisualState (const PageDescriptor& rDescriptor) { if (rDescriptor.HasState(PageDescriptor::ST_Excluded)) @@ -64,8 +63,6 @@ void VisualState::UpdateVisualState (const PageDescriptor& rDescriptor) SetVisualState(VS_None); } - - bool VisualState::SetLocationOffset (const Point& rOffset) { if (maLocationOffset != rOffset) @@ -77,7 +74,6 @@ bool VisualState::SetLocationOffset (const Point& rOffset) return false; } - } } } // end of namespace ::sd::slidesorter::model /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx index bad61abed479..50ac309006cc 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "SlideSorter.hxx" #include "SlideSorterViewShell.hxx" @@ -45,7 +44,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star; - namespace sd { namespace slidesorter { namespace { @@ -69,9 +67,6 @@ private: }; } - - - //===== SlideSorter =========================================================== ::boost::shared_ptr<SlideSorter> SlideSorter::CreateSlideSorter( @@ -92,9 +87,6 @@ private: return pSlideSorter; } - - - ::boost::shared_ptr<SlideSorter> SlideSorter::CreateSlideSorter ( ViewShellBase& rBase, ViewShell* pViewShell, @@ -109,9 +101,6 @@ private: return pSlideSorter; } - - - SlideSorter::SlideSorter ( ViewShell& rViewShell, const ::boost::shared_ptr<sd::Window>& rpContentWindow, @@ -136,9 +125,6 @@ SlideSorter::SlideSorter ( { } - - - SlideSorter::SlideSorter ( ViewShellBase& rBase, ViewShell* pViewShell, @@ -161,9 +147,6 @@ SlideSorter::SlideSorter ( { } - - - void SlideSorter::Init (void) { if (mpViewShellBase != NULL) @@ -208,9 +191,6 @@ void SlideSorter::Init (void) } } - - - SlideSorter::~SlideSorter (void) { mbIsValid = false; @@ -245,62 +225,30 @@ SlideSorter::~SlideSorter (void) mpContentWindow.reset(); } - - - - - - - - - - - - - - - - - - - - model::SlideSorterModel& SlideSorter::GetModel (void) const { OSL_ASSERT(mpSlideSorterModel.get()!=NULL); return *mpSlideSorterModel; } - - - view::SlideSorterView& SlideSorter::GetView (void) const { OSL_ASSERT(mpSlideSorterView.get()!=NULL); return *mpSlideSorterView; } - - - controller::SlideSorterController& SlideSorter::GetController (void) const { OSL_ASSERT(mpSlideSorterController.get()!=NULL); return *mpSlideSorterController; } - - - Reference<frame::XController> SlideSorter::GetXController (void) const { Reference<frame::XController> xController(mxControllerWeak); return xController; } - - - void SlideSorter::Paint (const Rectangle& rRepaintArea) { GetController().Paint( @@ -308,30 +256,12 @@ void SlideSorter::Paint (const Rectangle& rRepaintArea) GetContentWindow().get()); } - - - - - - - - - - - - - - - void SlideSorter::SetupControls (::Window* ) { GetVerticalScrollBar()->Show(); mpSlideSorterController->GetScrollBarManager().LateInitialization(); } - - - void SlideSorter::SetupListeners (void) { SharedSdWindow pWindow (GetContentWindow()); @@ -359,9 +289,6 @@ void SlideSorter::SetupListeners (void) mpSlideSorterController->GetScrollBarManager().Connect(); } - - - void SlideSorter::ReleaseListeners (void) { mpSlideSorterController->GetScrollBarManager().Disconnect(); @@ -387,9 +314,6 @@ void SlideSorter::ReleaseListeners (void) WindowEventHandler)); } - - - void SlideSorter::CreateModelViewController (void) { mpSlideSorterModel.reset(CreateModel()); @@ -411,9 +335,6 @@ void SlideSorter::CreateModelViewController (void) mpSlideSorterView->Init(); } - - - model::SlideSorterModel* SlideSorter::CreateModel (void) { // Get pointers to the document. @@ -428,17 +349,11 @@ model::SlideSorterModel* SlideSorter::CreateModel (void) return NULL; } - - - view::SlideSorterView* SlideSorter::CreateView (void) { return new view::SlideSorterView (*this); } - - - controller::SlideSorterController* SlideSorter::CreateController (void) { controller::SlideSorterController* pController @@ -446,9 +361,6 @@ controller::SlideSorterController* SlideSorter::CreateController (void) return pController; } - - - void SlideSorter::ArrangeGUIElements ( const Point& rOffset, const Size& rSize) @@ -473,9 +385,6 @@ void SlideSorter::ArrangeGUIElements ( } } - - - SvBorder SlideSorter::GetBorder (void) { SvBorder aBorder; @@ -491,9 +400,6 @@ SvBorder SlideSorter::GetBorder (void) return aBorder; } - - - bool SlideSorter::RelocateToWindow (::Window* pParentWindow) { // Stop all animations for they have been started for the old window. @@ -527,9 +433,6 @@ bool SlideSorter::RelocateToWindow (::Window* pParentWindow) return true; } - - - void SlideSorter::SetCurrentFunction (const rtl::Reference<FuPoor>& rpFunction) { if (GetViewShell() != NULL) @@ -545,27 +448,18 @@ void SlideSorter::SetCurrentFunction (const rtl::Reference<FuPoor>& rpFunction) } } - - - ::boost::shared_ptr<controller::Properties> SlideSorter::GetProperties (void) const { OSL_ASSERT(mpProperties); return mpProperties; } - - - ::boost::shared_ptr<view::Theme> SlideSorter::GetTheme (void) const { OSL_ASSERT(mpTheme); return mpTheme; } - - - //===== ContentWindow ========================================================= namespace { @@ -581,90 +475,57 @@ ContentWindow::ContentWindow( SetStyle(GetStyle() | WB_NOPOINTERFOCUS); } - - - ContentWindow::~ContentWindow (void) { } - - - void ContentWindow::SetCurrentFunction (const rtl::Reference<FuPoor>& rpFunction) { mpCurrentFunction = rpFunction; } - - - void ContentWindow::Paint (const Rectangle& rRect) { mrSlideSorter.Paint(rRect); } - - - void ContentWindow::KeyInput (const KeyEvent& rEvent) { if (mpCurrentFunction.is()) mpCurrentFunction->KeyInput(rEvent); } - - - void ContentWindow::MouseMove (const MouseEvent& rEvent) { if (mpCurrentFunction.is()) mpCurrentFunction->MouseMove(rEvent); } - - - void ContentWindow::MouseButtonUp(const MouseEvent& rEvent) { if (mpCurrentFunction.is()) mpCurrentFunction->MouseButtonUp(rEvent); } - - - void ContentWindow::MouseButtonDown(const MouseEvent& rEvent) { if (mpCurrentFunction.is()) mpCurrentFunction->MouseButtonDown(rEvent); } - - - void ContentWindow::Command(const CommandEvent& rEvent) { if (mpCurrentFunction.is()) mpCurrentFunction->Command(rEvent); } - - - bool ContentWindow::Notify (NotifyEvent&) { return false; } - - } // end of anonymous namespace - - - - } } // end of namespace ::sd::slidesorter /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx index f94a993e50fd..1d15c0935cc1 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "SlideSorterService.hxx" #include "facreg.hxx" #include "controller/SlideSorterController.hxx" @@ -54,9 +53,6 @@ namespace { }; } - - - //===== Service =============================================================== Reference<XInterface> SAL_CALL SlideSorterService_createInstance ( @@ -65,17 +61,11 @@ Reference<XInterface> SAL_CALL SlideSorterService_createInstance ( return Reference<XInterface>(static_cast<drawing::XDrawView*>(new SlideSorterService(rxContext))); } - - - OUString SlideSorterService_getImplementationName (void) throw(RuntimeException) { return OUString("com.sun.star.comp.Draw.SlideSorter"); } - - - Sequence<OUString> SAL_CALL SlideSorterService_getSupportedServiceNames (void) throw (RuntimeException) { @@ -83,9 +73,6 @@ Sequence<OUString> SAL_CALL SlideSorterService_getSupportedServiceNames (void) return Sequence<OUString>(&sServiceName, 1); } - - - //===== SlideSorterService ========================================================== SlideSorterService::SlideSorterService (const Reference<XComponentContext>& rxContext) @@ -96,16 +83,10 @@ SlideSorterService::SlideSorterService (const Reference<XComponentContext>& rxCo (void)rxContext; } - - - SlideSorterService::~SlideSorterService (void) { } - - - void SAL_CALL SlideSorterService::disposing (void) { mpSlideSorter.reset(); @@ -116,9 +97,6 @@ void SAL_CALL SlideSorterService::disposing (void) } } - - - //----- XInitialization ------------------------------------------------------- void SAL_CALL SlideSorterService::initialize (const Sequence<Any>& rArguments) @@ -169,9 +147,6 @@ void SAL_CALL SlideSorterService::initialize (const Sequence<Any>& rArguments) } } - - - //----- XView ----------------------------------------------------------------- Reference<XResourceId> SAL_CALL SlideSorterService::getResourceId (void) @@ -180,18 +155,12 @@ Reference<XResourceId> SAL_CALL SlideSorterService::getResourceId (void) return mxViewId; } - - - sal_Bool SAL_CALL SlideSorterService::isAnchorOnly (void) throw (RuntimeException, std::exception) { return sal_False; } - - - //----- XWindowListener ------------------------------------------------------- void SAL_CALL SlideSorterService::windowResized (const awt::WindowEvent& rEvent) @@ -203,19 +172,12 @@ void SAL_CALL SlideSorterService::windowResized (const awt::WindowEvent& rEvent) Resize(); } - - - - void SAL_CALL SlideSorterService::windowMoved (const awt::WindowEvent& rEvent) throw (RuntimeException, std::exception) { (void)rEvent; } - - - void SAL_CALL SlideSorterService::windowShown (const lang::EventObject& rEvent) throw (RuntimeException, std::exception) { @@ -224,9 +186,6 @@ void SAL_CALL SlideSorterService::windowShown (const lang::EventObject& rEvent) Resize(); } - - - void SAL_CALL SlideSorterService::windowHidden (const lang::EventObject& rEvent) throw (RuntimeException, std::exception) { @@ -234,9 +193,6 @@ void SAL_CALL SlideSorterService::windowHidden (const lang::EventObject& rEvent) ThrowIfDisposed(); } - - - //----- lang::XEventListener -------------------------------------------------- void SAL_CALL SlideSorterService::disposing (const lang::EventObject& rEvent) @@ -246,9 +202,6 @@ void SAL_CALL SlideSorterService::disposing (const lang::EventObject& rEvent) mxParentWindow = NULL; } - - - //----- XDrawView ------------------------------------------------------------- void SAL_CALL SlideSorterService::setCurrentPage(const Reference<drawing::XDrawPage>& rxSlide) @@ -260,9 +213,6 @@ void SAL_CALL SlideSorterService::setCurrentPage(const Reference<drawing::XDrawP mpSlideSorter->GetModel().GetIndex(rxSlide)); } - - - Reference<drawing::XDrawPage> SAL_CALL SlideSorterService::getCurrentPage (void) throw (RuntimeException, std::exception) { @@ -273,21 +223,14 @@ Reference<drawing::XDrawPage> SAL_CALL SlideSorterService::getCurrentPage (void) return NULL; } - - - //----- attributes ------------------------------------------------------------ - Reference<container::XIndexAccess> SAL_CALL SlideSorterService::getDocumentSlides (void) throw (RuntimeException, std::exception) { return mpSlideSorter->GetModel().GetDocumentSlides(); } - - - void SAL_CALL SlideSorterService::setDocumentSlides ( const Reference<container::XIndexAccess >& rxSlides) throw (RuntimeException, std::exception) @@ -297,9 +240,6 @@ void SAL_CALL SlideSorterService::setDocumentSlides ( mpSlideSorter->GetController().SetDocumentSlides(rxSlides); } - - - sal_Bool SAL_CALL SlideSorterService::getIsHighlightCurrentSlide (void) throw (RuntimeException, std::exception) { @@ -310,9 +250,6 @@ sal_Bool SAL_CALL SlideSorterService::getIsHighlightCurrentSlide (void) return mpSlideSorter->GetProperties()->IsHighlightCurrentSlide(); } - - - void SAL_CALL SlideSorterService::setIsHighlightCurrentSlide (sal_Bool bValue) throw (RuntimeException, std::exception) { @@ -325,9 +262,6 @@ void SAL_CALL SlideSorterService::setIsHighlightCurrentSlide (sal_Bool bValue) } } - - - sal_Bool SAL_CALL SlideSorterService::getIsShowSelection (void) throw (RuntimeException, std::exception) { @@ -338,9 +272,6 @@ sal_Bool SAL_CALL SlideSorterService::getIsShowSelection (void) return mpSlideSorter->GetProperties()->IsShowSelection(); } - - - void SAL_CALL SlideSorterService::setIsShowSelection (sal_Bool bValue) throw (RuntimeException, std::exception) { @@ -349,9 +280,6 @@ void SAL_CALL SlideSorterService::setIsShowSelection (sal_Bool bValue) mpSlideSorter->GetProperties()->SetShowSelection(bValue); } - - - sal_Bool SAL_CALL SlideSorterService::getIsShowFocus (void) throw (RuntimeException, std::exception) { @@ -362,9 +290,6 @@ sal_Bool SAL_CALL SlideSorterService::getIsShowFocus (void) return mpSlideSorter->GetProperties()->IsShowFocus(); } - - - void SAL_CALL SlideSorterService::setIsShowFocus (sal_Bool bValue) throw (RuntimeException, std::exception) { @@ -373,9 +298,6 @@ void SAL_CALL SlideSorterService::setIsShowFocus (sal_Bool bValue) mpSlideSorter->GetProperties()->SetShowFocus(bValue); } - - - sal_Bool SAL_CALL SlideSorterService::getIsCenterSelection (void) throw (RuntimeException, std::exception) { @@ -386,9 +308,6 @@ sal_Bool SAL_CALL SlideSorterService::getIsCenterSelection (void) return mpSlideSorter->GetProperties()->IsCenterSelection(); } - - - void SAL_CALL SlideSorterService::setIsCenterSelection (sal_Bool bValue) throw (RuntimeException, std::exception) { @@ -397,9 +316,6 @@ void SAL_CALL SlideSorterService::setIsCenterSelection (sal_Bool bValue) mpSlideSorter->GetProperties()->SetCenterSelection(bValue); } - - - sal_Bool SAL_CALL SlideSorterService::getIsSuspendPreviewUpdatesDuringFullScreenPresentation (void) throw (RuntimeException, std::exception) { @@ -411,9 +327,6 @@ sal_Bool SAL_CALL SlideSorterService::getIsSuspendPreviewUpdatesDuringFullScreen ->IsSuspendPreviewUpdatesDuringFullScreenPresentation(); } - - - void SAL_CALL SlideSorterService::setIsSuspendPreviewUpdatesDuringFullScreenPresentation ( sal_Bool bValue) throw (RuntimeException, std::exception) @@ -424,9 +337,6 @@ void SAL_CALL SlideSorterService::setIsSuspendPreviewUpdatesDuringFullScreenPres ->SetSuspendPreviewUpdatesDuringFullScreenPresentation(bValue); } - - - sal_Bool SAL_CALL SlideSorterService::getIsOrientationVertical (void) throw (RuntimeException, std::exception) { @@ -437,9 +347,6 @@ sal_Bool SAL_CALL SlideSorterService::getIsOrientationVertical (void) return mpSlideSorter->GetView().GetOrientation() != Layouter::HORIZONTAL; } - - - void SAL_CALL SlideSorterService::setIsOrientationVertical (sal_Bool bValue) throw (RuntimeException, std::exception) { @@ -450,9 +357,6 @@ void SAL_CALL SlideSorterService::setIsOrientationVertical (sal_Bool bValue) : Layouter::HORIZONTAL); } - - - sal_Bool SAL_CALL SlideSorterService::getIsSmoothScrolling (void) throw (RuntimeException, std::exception) { @@ -463,9 +367,6 @@ sal_Bool SAL_CALL SlideSorterService::getIsSmoothScrolling (void) return mpSlideSorter->GetProperties()->IsSmoothSelectionScrolling(); } - - - void SAL_CALL SlideSorterService::setIsSmoothScrolling (sal_Bool bValue) throw (RuntimeException, std::exception) { @@ -474,9 +375,6 @@ void SAL_CALL SlideSorterService::setIsSmoothScrolling (sal_Bool bValue) mpSlideSorter->GetProperties()->SetSmoothSelectionScrolling(bValue); } - - - util::Color SAL_CALL SlideSorterService::getBackgroundColor (void) throw (RuntimeException, std::exception) { @@ -488,9 +386,6 @@ util::Color SAL_CALL SlideSorterService::getBackgroundColor (void) mpSlideSorter->GetProperties()->GetBackgroundColor().GetColor()); } - - - void SAL_CALL SlideSorterService::setBackgroundColor (util::Color aBackgroundColor) throw (RuntimeException, std::exception) { @@ -499,9 +394,6 @@ void SAL_CALL SlideSorterService::setBackgroundColor (util::Color aBackgroundCol mpSlideSorter->GetProperties()->SetBackgroundColor(Color(aBackgroundColor)); } - - - util::Color SAL_CALL SlideSorterService::getTextColor (void) throw (css::uno::RuntimeException, std::exception) { @@ -513,9 +405,6 @@ util::Color SAL_CALL SlideSorterService::getTextColor (void) mpSlideSorter->GetProperties()->GetTextColor().GetColor()); } - - - void SAL_CALL SlideSorterService::setTextColor (util::Color aTextColor) throw (RuntimeException, std::exception) { @@ -524,9 +413,6 @@ void SAL_CALL SlideSorterService::setTextColor (util::Color aTextColor) mpSlideSorter->GetProperties()->SetTextColor(Color(aTextColor)); } - - - util::Color SAL_CALL SlideSorterService::getSelectionColor (void) throw (RuntimeException, std::exception) { @@ -538,9 +424,6 @@ util::Color SAL_CALL SlideSorterService::getSelectionColor (void) mpSlideSorter->GetProperties()->GetSelectionColor().GetColor()); } - - - void SAL_CALL SlideSorterService::setSelectionColor (util::Color aSelectionColor) throw (RuntimeException, std::exception) { @@ -549,9 +432,6 @@ void SAL_CALL SlideSorterService::setSelectionColor (util::Color aSelectionColor mpSlideSorter->GetProperties()->SetSelectionColor(Color(aSelectionColor)); } - - - util::Color SAL_CALL SlideSorterService::getHighlightColor (void) throw (RuntimeException, std::exception) { @@ -563,9 +443,6 @@ util::Color SAL_CALL SlideSorterService::getHighlightColor (void) mpSlideSorter->GetProperties()->GetHighlightColor().GetColor()); } - - - void SAL_CALL SlideSorterService::setHighlightColor (util::Color aHighlightColor) throw (RuntimeException, std::exception) { @@ -574,8 +451,6 @@ void SAL_CALL SlideSorterService::setHighlightColor (util::Color aHighlightColor mpSlideSorter->GetProperties()->SetHighlightColor(Color(aHighlightColor)); } - - sal_Bool SAL_CALL SlideSorterService::getIsUIReadOnly (void) throw (RuntimeException, std::exception) { @@ -586,9 +461,6 @@ sal_Bool SAL_CALL SlideSorterService::getIsUIReadOnly (void) return mpSlideSorter->GetProperties()->IsUIReadOnly(); } - - - void SAL_CALL SlideSorterService::setIsUIReadOnly (sal_Bool bIsUIReadOnly) throw (RuntimeException, std::exception) { @@ -597,11 +469,6 @@ void SAL_CALL SlideSorterService::setIsUIReadOnly (sal_Bool bIsUIReadOnly) mpSlideSorter->GetProperties()->SetUIReadOnly(bIsUIReadOnly); } - - - - - void SlideSorterService::Resize (void) { if (mxParentWindow.is()) @@ -613,9 +480,6 @@ void SlideSorterService::Resize (void) } } - - - void SlideSorterService::ThrowIfDisposed (void) throw (::com::sun::star::lang::DisposedException) { @@ -626,7 +490,6 @@ void SlideSorterService::ThrowIfDisposed (void) } } - } } // end of namespace ::sd::presenter /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx index b80d53de0ac7..4ce1b5281681 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx @@ -45,7 +45,6 @@ namespace { > SlideSorterServiceInterfaceBase; } - /** Implementation of the com.sun.star.drawing.SlideSorter service. */ class SlideSorterService @@ -59,13 +58,11 @@ public: virtual ~SlideSorterService (void); virtual void SAL_CALL disposing (void) SAL_OVERRIDE; - // XInitialization virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XResourceId css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId (void) @@ -74,7 +71,6 @@ public: sal_Bool SAL_CALL isAnchorOnly (void) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XWindowListener virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) @@ -89,12 +85,10 @@ public: virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // lang::XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XDrawView virtual void SAL_CALL setCurrentPage( @@ -104,7 +98,6 @@ public: virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage (void) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // Attributes virtual css::uno::Reference<css::container::XIndexAccess> SAL_CALL getDocumentSlides (void) diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index 5c7f6cb4312e..1185a64a9e51 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "SlideSorterViewShell.hxx" #include "ViewShellImplementation.hxx" @@ -116,9 +115,6 @@ TYPEINIT1(SlideSorterViewShell, ViewShell); return pViewShell; } - - - SlideSorterViewShell::SlideSorterViewShell ( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, @@ -141,9 +137,6 @@ SlideSorterViewShell::SlideSorterViewShell ( pParentWindow->SetStyle(pParentWindow->GetStyle() | WB_DIALOGCONTROL); } - - - SlideSorterViewShell::~SlideSorterViewShell (void) { DisposeFunctions(); @@ -168,10 +161,6 @@ SlideSorterViewShell::~SlideSorterViewShell (void) GetFrameView()->Disconnect(); } - - - - void SlideSorterViewShell::Initialize (void) { mpSlideSorter = SlideSorter::CreateSlideSorter( @@ -200,9 +189,6 @@ void SlideSorterViewShell::Initialize (void) } } - - - void SlideSorterViewShell::Init (bool bIsMainViewShell) { ViewShell::Init(bIsMainViewShell); @@ -217,9 +203,6 @@ void SlideSorterViewShell::Init (bool bIsMainViewShell) mpContentWindow->SetViewShell(this); } - - - SlideSorterViewShell* SlideSorterViewShell::GetSlideSorter (ViewShellBase& rBase) { SlideSorterViewShell* pViewShell = NULL; @@ -247,9 +230,6 @@ SlideSorterViewShell* SlideSorterViewShell::GetSlideSorter (ViewShellBase& rBase return pViewShell; } - - - Reference<drawing::XDrawSubController> SlideSorterViewShell::CreateSubController (void) { Reference<drawing::XDrawSubController> xSubController; @@ -265,9 +245,6 @@ Reference<drawing::XDrawSubController> SlideSorterViewShell::CreateSubController return xSubController; } - - - /** If there is a valid controller then create a new instance of <type>AccessibleSlideSorterView</type>. Otherwise delegate this call to the base class to return a default object (probably an empty @@ -315,9 +292,6 @@ SlideSorter& SlideSorterViewShell::GetSlideSorter (void) const return *mpSlideSorter; } - - - bool SlideSorterViewShell::RelocateToParentWindow (::Window* pParentWindow) { OSL_ASSERT(mpSlideSorter); @@ -333,9 +307,6 @@ bool SlideSorterViewShell::RelocateToParentWindow (::Window* pParentWindow) return bSuccess; } - - - ::svl::IUndoManager* SlideSorterViewShell::ImpGetUndoManager (void) const { SfxShell* pObjectBar = GetViewShellBase().GetViewShellManager()->GetTopShell(); @@ -354,27 +325,18 @@ bool SlideSorterViewShell::RelocateToParentWindow (::Window* pParentWindow) } } - - - void SlideSorterViewShell::GetFocus (void) { OSL_ASSERT(mpSlideSorter.get()!=NULL); mpSlideSorter->GetController().GetFocusManager().ShowFocus(); } - - - void SlideSorterViewShell::LoseFocus (void) { OSL_ASSERT(mpSlideSorter.get()!=NULL); mpSlideSorter->GetController().GetFocusManager().HideFocus(); } - - - SdPage* SlideSorterViewShell::getCurrentPage(void) const { // since SlideSorterViewShell::GetActualPage() currently also @@ -383,9 +345,6 @@ SdPage* SlideSorterViewShell::getCurrentPage(void) const return const_cast<SlideSorterViewShell*>(this)->GetActualPage(); } - - - SdPage* SlideSorterViewShell::GetActualPage (void) { SdPage* pCurrentPage = NULL; @@ -415,9 +374,6 @@ SdPage* SlideSorterViewShell::GetActualPage (void) return pCurrentPage; } - - - void SlideSorterViewShell::GetMenuState ( SfxItemSet& rSet) { ViewShell::GetMenuState(rSet); @@ -425,9 +381,6 @@ void SlideSorterViewShell::GetMenuState ( SfxItemSet& rSet) mpSlideSorter->GetController().GetSlotManager()->GetMenuState(rSet); } - - - void SlideSorterViewShell::GetClipboardState ( SfxItemSet& rSet) { ViewShell::GetMenuState(rSet); @@ -435,36 +388,24 @@ void SlideSorterViewShell::GetClipboardState ( SfxItemSet& rSet) mpSlideSorter->GetController().GetSlotManager()->GetClipboardState(rSet); } - - - void SlideSorterViewShell::ExecCtrl (SfxRequest& rRequest) { OSL_ASSERT(mpSlideSorter.get()!=NULL); mpSlideSorter->GetController().ExecCtrl(rRequest); } - - - void SlideSorterViewShell::GetCtrlState (SfxItemSet& rSet) { OSL_ASSERT(mpSlideSorter.get()!=NULL); mpSlideSorter->GetController().GetCtrlState(rSet); } - - - void SlideSorterViewShell::FuSupport (SfxRequest& rRequest) { OSL_ASSERT(mpSlideSorter.get()!=NULL); mpSlideSorter->GetController().FuSupport(rRequest); } - - - /** We have to handle those slot calls here that need to have access to private or protected members and methods of this class. */ @@ -492,45 +433,30 @@ void SlideSorterViewShell::FuTemporary (SfxRequest& rRequest) } } - - - void SlideSorterViewShell::GetStatusBarState (SfxItemSet& rSet) { OSL_ASSERT(mpSlideSorter.get()!=NULL); mpSlideSorter->GetController().GetStatusBarState(rSet); } - - - void SlideSorterViewShell::FuPermanent (SfxRequest& rRequest) { OSL_ASSERT(mpSlideSorter.get()!=NULL); mpSlideSorter->GetController().FuPermanent(rRequest); } - - - void SlideSorterViewShell::GetAttrState (SfxItemSet& rSet) { OSL_ASSERT(mpSlideSorter.get()!=NULL); mpSlideSorter->GetController().GetAttrState(rSet); } - - - void SlideSorterViewShell::ExecStatusBar (SfxRequest& rRequest) { OSL_ASSERT(mpSlideSorter.get()!=NULL); mpSlideSorter->GetController().ExecStatusBar(rRequest); } - - - void SlideSorterViewShell::Paint ( const Rectangle& rBBox, ::sd::Window* pWindow) @@ -541,9 +467,6 @@ void SlideSorterViewShell::Paint ( mpSlideSorter->GetController().Paint(rBBox,pWindow); } - - - void SlideSorterViewShell::ArrangeGUIElements (void) { if (IsActive()) @@ -556,9 +479,6 @@ void SlideSorterViewShell::ArrangeGUIElements (void) mbIsArrangeGUIElementsPending = true; } - - - void SlideSorterViewShell::Activate (bool bIsMDIActivate) { ViewShell::Activate(bIsMDIActivate); @@ -595,27 +515,18 @@ void SlideSorterViewShell::Activate (bool bIsMDIActivate) eContext); } - - - void SlideSorterViewShell::Deactivate (bool /*bIsMDIActivate*/) { // Save Settings - Specifically SlidesPerRow to retrieve it later WriteFrameViewData(); } - - - SvBorder SlideSorterViewShell::GetBorder (bool ) { OSL_ASSERT(mpSlideSorter.get()!=NULL); return mpSlideSorter->GetBorder(); } - - - void SlideSorterViewShell::Command ( const CommandEvent& rEvent, ::sd::Window* pWindow) @@ -625,9 +536,6 @@ void SlideSorterViewShell::Command ( ViewShell::Command (rEvent, pWindow); } - - - void SlideSorterViewShell::ReadFrameViewData (FrameView* pFrameView) { OSL_ASSERT(mpSlideSorter.get()!=NULL); @@ -664,9 +572,6 @@ void SlideSorterViewShell::ReadFrameViewData (FrameView* pFrameView) } } - - - void SlideSorterViewShell::WriteFrameViewData (void) { OSL_ASSERT(mpSlideSorter.get()!=NULL); @@ -698,9 +603,6 @@ void SlideSorterViewShell::WriteFrameViewData (void) } } - - - void SlideSorterViewShell::SetZoom (long int ) { // Ignored. @@ -708,9 +610,6 @@ void SlideSorterViewShell::SetZoom (long int ) // the window. } - - - void SlideSorterViewShell::SetZoomRect (const Rectangle& rZoomRect) { OSL_ASSERT(mpSlideSorter.get()!=NULL); @@ -750,9 +649,6 @@ void SlideSorterViewShell::SetZoomRect (const Rectangle& rZoomRect) GetViewFrame()->GetBindings().Invalidate( SID_ATTR_ZOOMSLIDER ); } - - - void SlideSorterViewShell::UpdateScrollBars (void) { // Do not call the overwritten method of the base class: We do all the @@ -760,9 +656,6 @@ void SlideSorterViewShell::UpdateScrollBars (void) mpSlideSorter->GetController().GetScrollBarManager().UpdateScrollBars (false); } - - - void SlideSorterViewShell::StartDrag ( const Point& rDragPt, ::Window* pWindow ) @@ -773,9 +666,6 @@ void SlideSorterViewShell::StartDrag ( pWindow); } - - - void SlideSorterViewShell::DragFinished ( sal_Int8 nDropAction) { @@ -783,9 +673,6 @@ void SlideSorterViewShell::DragFinished ( mpSlideSorter->GetController().GetClipboard().DragFinished (nDropAction); } - - - sal_Int8 SlideSorterViewShell::AcceptDrop ( const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, @@ -802,9 +689,6 @@ sal_Int8 SlideSorterViewShell::AcceptDrop ( nLayer); } - - - sal_Int8 SlideSorterViewShell::ExecuteDrop ( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, @@ -821,9 +705,6 @@ sal_Int8 SlideSorterViewShell::ExecuteDrop ( nLayer); } - - - ::boost::shared_ptr<SlideSorterViewShell::PageSelection> SlideSorterViewShell::GetPageSelection (void) const { @@ -831,9 +712,6 @@ sal_Int8 SlideSorterViewShell::ExecuteDrop ( return mpSlideSorter->GetController().GetPageSelector().GetPageSelection(); } - - - void SlideSorterViewShell::SetPageSelection ( const ::boost::shared_ptr<PageSelection>& rSelection) { @@ -841,9 +719,6 @@ void SlideSorterViewShell::SetPageSelection ( mpSlideSorter->GetController().GetPageSelector().SetPageSelection(rSelection); } - - - void SlideSorterViewShell::AddSelectionChangeListener ( const Link& rCallback) { @@ -851,9 +726,6 @@ void SlideSorterViewShell::AddSelectionChangeListener ( mpSlideSorter->GetController().GetSelectionManager()->AddSelectionChangeListener(rCallback); } - - - void SlideSorterViewShell::RemoveSelectionChangeListener ( const Link& rCallback) { @@ -861,8 +733,6 @@ void SlideSorterViewShell::RemoveSelectionChangeListener ( mpSlideSorter->GetController().GetSelectionManager()->RemoveSelectionChangeListener(rCallback); } - - } } // end of namespace ::sd::slidesorter /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index d6bfbe008eb3..e29c86e6ca50 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "view/SlideSorterView.hxx" #include "ViewShellBase.hxx" @@ -75,12 +74,10 @@ #endif #include <boost/foreach.hpp> - using namespace std; using namespace ::sd::slidesorter::model; using namespace ::drawinglayer::primitive2d; - namespace sd { namespace slidesorter { namespace view { namespace { @@ -107,8 +104,6 @@ namespace { }; } - - class BackgroundPainter : public ILayerPainter, public ::boost::noncopyable @@ -132,8 +127,6 @@ private: Color maBackgroundColor; }; - - TYPEINIT1(SlideSorterView, ::sd::View); SlideSorterView::SlideSorterView (SlideSorter& rSlideSorter) @@ -184,9 +177,6 @@ SlideSorterView::SlideSorterView (SlideSorter& rSlideSorter) mpLayeredDevice->RegisterPainter(pPainter, 1); } - - - SlideSorterView::~SlideSorterView (void) { if ( ! mbIsDisposed) @@ -196,17 +186,11 @@ SlideSorterView::~SlideSorterView (void) } } - - - void SlideSorterView::Init (void) { HandleModelChange(); } - - - void SlideSorterView::Dispose (void) { mpSelectionPainter.reset(); @@ -229,9 +213,6 @@ void SlideSorterView::Dispose (void) mbIsDisposed = true; } - - - sal_Int32 SlideSorterView::GetPageIndexAtPoint (const Point& rWindowPosition) const { sal_Int32 nIndex (-1); @@ -249,35 +230,23 @@ sal_Int32 SlideSorterView::GetPageIndexAtPoint (const Point& rWindowPosition) co return nIndex; } - - - Layouter& SlideSorterView::GetLayouter (void) { return *mpLayouter.get(); } - - - void SlideSorterView::ModelHasChanged (void) { // Ignore this call. Rely on hints sent by the model to get informed of // model changes. } - - - void SlideSorterView::PreModelChange (void) { // Reset the slide under the mouse. It will be re-set in PostModelChange(). SetPageUnderMouse(SharedPageDescriptor()); } - - - void SlideSorterView::PostModelChange (void) { // In PreModelChange() the page objects have been released. Here we @@ -292,9 +261,6 @@ void SlideSorterView::PostModelChange (void) RequestRepaint(); } - - - /** At the moment for every model change all page objects are destroyed and re-created again. This can be optimized by accepting hints that describe the type of change so that existing page objects can be @@ -306,9 +272,6 @@ void SlideSorterView::HandleModelChange (void) PostModelChange(); } - - - void SlideSorterView::HandleDrawModeChange (void) { // Replace the preview cache with a new and empty one. The @@ -320,9 +283,6 @@ void SlideSorterView::HandleDrawModeChange (void) RequestRepaint(); } - - - void SlideSorterView::HandleDataChangeEvent (void) { GetPageObjectPainter()->SetTheme(mrSlideSorter.GetTheme()); @@ -336,9 +296,6 @@ void SlideSorterView::HandleDataChangeEvent (void) RequestRepaint(); } - - - void SlideSorterView::Resize (void) { UpdateOrientation(); @@ -347,18 +304,12 @@ void SlideSorterView::Resize (void) RequestRearrange(); } - - - void SlideSorterView::RequestRearrange (void) { mbIsRearrangePending = true; Rearrange(); } - - - void SlideSorterView::Rearrange (void) { if ( ! mbIsRearrangePending) @@ -388,9 +339,6 @@ void SlideSorterView::Rearrange (void) } } - - - void SlideSorterView::UpdateOrientation (void) { // The layout of slides depends on whether the slide sorter is @@ -459,9 +407,6 @@ void SlideSorterView::UpdateOrientation (void) } } - - - void SlideSorterView::Layout () { SharedSdWindow pWindow (mrSlideSorter.GetContentWindow()); @@ -499,17 +444,11 @@ void SlideSorterView::Layout () InvalidatePageObjectVisibilities (); } - - - void SlideSorterView::InvalidatePageObjectVisibilities (void) { mbPageObjectVisibilitiesValid = false; } - - - void SlideSorterView::DeterminePageObjectVisibilities (void) { SharedSdWindow pWindow (mrSlideSorter.GetContentWindow()); @@ -559,15 +498,11 @@ void SlideSorterView::DeterminePageObjectVisibilities (void) } } - // Restore the mouse over state. UpdatePageUnderMouse(); } } - - - void SlideSorterView::UpdatePreciousFlags (void) { if (mbPreciousFlagUpdatePending) @@ -600,9 +535,6 @@ void SlideSorterView::UpdatePreciousFlags (void) } } - - - bool SlideSorterView::SetOrientation (const Layouter::Orientation eOrientation) { if (meOrientation != eOrientation) @@ -627,18 +559,12 @@ void SlideSorterView::RequestRepaint (void) } } - - - void SlideSorterView::RequestRepaint (const model::SharedPageDescriptor& rpDescriptor) { if (rpDescriptor) RequestRepaint(rpDescriptor->GetBoundingBox()); } - - - void SlideSorterView::RequestRepaint (const Rectangle& rRepaintBox) { SharedSdWindow pWindow (mrSlideSorter.GetContentWindow()); @@ -649,8 +575,6 @@ void SlideSorterView::RequestRepaint (const Rectangle& rRepaintBox) } } - - void SlideSorterView::RequestRepaint (const Region& rRepaintRegion) { SharedSdWindow pWindow (mrSlideSorter.GetContentWindow()); @@ -661,15 +585,11 @@ void SlideSorterView::RequestRepaint (const Region& rRepaintRegion) } } - - - Rectangle SlideSorterView::GetModelArea (void) { return mpLayouter->GetTotalBoundingBox(); } - #ifdef DEBUG_TIMING static ::canvas::tools::ElapsedTime gaTimer; static const size_t gFrameTimeCount (10); @@ -724,7 +644,6 @@ void SlideSorterView::CompleteRedraw ( gFrameTimeSum += gFrameTimes[gFrameTimeIndex]; gFrameTimeIndex = (gFrameTimeIndex+1) % gFrameTimeCount; - mrSlideSorter.GetContentWindow()->SetFillColor(COL_BLUE); mrSlideSorter.GetContentWindow()->DrawRect(gFrameTimeBox); mrSlideSorter.GetContentWindow()->SetTextColor(COL_WHITE); @@ -736,9 +655,6 @@ void SlideSorterView::CompleteRedraw ( #endif } - - - void SlideSorterView::Paint ( OutputDevice& rDevice, const Rectangle& rRepaintArea) @@ -770,9 +686,6 @@ void SlideSorterView::Paint ( } } - - - void SlideSorterView::ConfigurationChanged ( utl::ConfigurationBroadcaster* pBroadcaster, sal_uInt32 nHint) @@ -786,9 +699,6 @@ void SlideSorterView::ConfigurationChanged ( } - - - ::boost::shared_ptr<cache::PageCache> SlideSorterView::GetPreviewCache (void) { SharedSdWindow pWindow (mrSlideSorter.GetContentWindow()); @@ -804,9 +714,6 @@ void SlideSorterView::ConfigurationChanged ( return mpPreviewCache; } - - - Pair SlideSorterView::GetVisiblePageRange (void) { if ( ! mbPageObjectVisibilitiesValid) @@ -814,9 +721,6 @@ Pair SlideSorterView::GetVisiblePageRange (void) return maVisiblePageRange; } - - - void SlideSorterView::AddVisibilityChangeListener (const Link& rListener) { if (::std::find ( @@ -828,9 +732,6 @@ void SlideSorterView::AddVisibilityChangeListener (const Link& rListener) } } - - - void SlideSorterView::RemoveVisibilityChangeListener(const Link&rListener) { maVisibilityChangeListeners.erase ( @@ -840,18 +741,12 @@ void SlideSorterView::RemoveVisibilityChangeListener(const Link&rListener) rListener)); } - - - ToolTip& SlideSorterView::GetToolTip (void) const { OSL_ASSERT(mpToolTip); return *mpToolTip; } - - - void SlideSorterView::DragFinished (sal_Int8 nDropAction) { mrSlideSorter.GetController().GetClipboard().DragFinished(nDropAction); @@ -859,9 +754,6 @@ void SlideSorterView::DragFinished (sal_Int8 nDropAction) View::DragFinished(nDropAction); } - - - void SlideSorterView::Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint) { ::sd::DrawDocShell* pDocShell = mrModel.GetDocument()->GetDocSh(); @@ -871,9 +763,6 @@ void SlideSorterView::Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint ::sd::View::Notify(rBroadcaster, rHint); } - - - void SlideSorterView::UpdatePageUnderMouse () { ::boost::shared_ptr<ScrollBar> pVScrollBar (mrSlideSorter.GetVerticalScrollBar()); @@ -902,18 +791,12 @@ void SlideSorterView::UpdatePageUnderMouse () SetPageUnderMouse(SharedPageDescriptor()); } - - - void SlideSorterView::UpdatePageUnderMouse ( const Point& rMousePosition) { SetPageUnderMouse(mrSlideSorter.GetController().GetPageAt(rMousePosition)); } - - - void SlideSorterView::SetPageUnderMouse ( const model::SharedPageDescriptor& rpDescriptor) { @@ -933,9 +816,6 @@ void SlideSorterView::SetPageUnderMouse ( } } - - - bool SlideSorterView::SetState ( const model::SharedPageDescriptor& rpDescriptor, const PageDescriptor::State eState, @@ -962,9 +842,6 @@ bool SlideSorterView::SetState ( return bModified; } - - - ::boost::shared_ptr<PageObjectPainter> SlideSorterView::GetPageObjectPainter (void) { if ( ! mpPageObjectPainter) @@ -983,9 +860,6 @@ SlideSorterView::DrawLock::DrawLock (SlideSorter& rSlideSorter) ++mrView.mnLockRedrawSmph; } - - - SlideSorterView::DrawLock::~DrawLock (void) { OSL_ASSERT(mrView.mnLockRedrawSmph>0); @@ -998,15 +872,11 @@ SlideSorterView::DrawLock::~DrawLock (void) } } - - - void SlideSorterView::DrawLock::Dispose (void) { mpWindow.reset(); } - } } } // end of namespace ::sd::slidesorter::view /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/view/SlsFontProvider.cxx b/sd/source/ui/slidesorter/view/SlsFontProvider.cxx index f4d0571aca24..970351c33355 100644 --- a/sd/source/ui/slidesorter/view/SlsFontProvider.cxx +++ b/sd/source/ui/slidesorter/view/SlsFontProvider.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "view/SlsFontProvider.hxx" #include "controller/SlideSorterController.hxx" @@ -25,7 +24,6 @@ #include <sfx2/app.hxx> #include <com/sun/star/uno/RuntimeException.hpp> - using namespace ::sd::slidesorter; namespace sd { namespace slidesorter { namespace view { @@ -63,32 +61,21 @@ FontProvider& FontProvider::Instance (void) return *mpInstance; } - - - FontProvider::FontProvider (void) : maFont(), maMapMode() { } - - - FontProvider::~FontProvider (void) { } - - - void FontProvider::Invalidate (void) { maFont.reset(); } - - } } } // end of namespace ::sd::slidesorter::view /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/view/SlsFramePainter.cxx b/sd/source/ui/slidesorter/view/SlsFramePainter.cxx index 746dbb59730c..6a737066f120 100644 --- a/sd/source/ui/slidesorter/view/SlsFramePainter.cxx +++ b/sd/source/ui/slidesorter/view/SlsFramePainter.cxx @@ -17,12 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "SlsFramePainter.hxx" #include <vcl/outdev.hxx> #include <vcl/bmpacc.hxx> - namespace sd { namespace slidesorter { namespace view { FramePainter::FramePainter (const BitmapEx& rShadowBitmap) @@ -51,16 +49,10 @@ FramePainter::FramePainter (const BitmapEx& rShadowBitmap) } } - - - FramePainter::~FramePainter (void) { } - - - void FramePainter::PaintFrame ( OutputDevice& rDevice, const Rectangle& rBox) const @@ -80,9 +72,6 @@ void FramePainter::PaintFrame ( maCenter.PaintCenter(rDevice,rBox); } - - - void FramePainter::AdaptColor ( const Color aNewColor, const bool bEraseCenter) @@ -112,9 +101,6 @@ void FramePainter::AdaptColor ( maBottomRight.maBitmap.Replace(aSourceColor, aNewColor, 0); } - - - //===== FramePainter::OffsetBitmap ============================================ FramePainter::OffsetBitmap::OffsetBitmap ( @@ -161,9 +147,6 @@ FramePainter::OffsetBitmap::OffsetBitmap ( } } - - - void FramePainter::OffsetBitmap::PaintCorner ( OutputDevice& rDevice, const Point& rAnchor) const @@ -172,9 +155,6 @@ void FramePainter::OffsetBitmap::PaintCorner ( rDevice.DrawBitmapEx(rAnchor+maOffset, maBitmap); } - - - void FramePainter::OffsetBitmap::PaintSide ( OutputDevice& rDevice, const Point& rAnchor1, @@ -233,9 +213,6 @@ void FramePainter::OffsetBitmap::PaintSide ( } } - - - void FramePainter::OffsetBitmap::PaintCenter ( OutputDevice& rDevice, const Rectangle& rBox) const @@ -251,8 +228,6 @@ void FramePainter::OffsetBitmap::PaintCenter ( maBitmap); } - - } } } // end of namespace sd::slidesorter::view /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/view/SlsFramePainter.hxx b/sd/source/ui/slidesorter/view/SlsFramePainter.hxx index 322968a66e23..b0f1b55168fe 100644 --- a/sd/source/ui/slidesorter/view/SlsFramePainter.hxx +++ b/sd/source/ui/slidesorter/view/SlsFramePainter.hxx @@ -22,7 +22,6 @@ #include <vcl/bitmapex.hxx> - namespace sd { namespace slidesorter { namespace view { class FramePainter @@ -107,7 +106,6 @@ private: bool mbIsValid; }; - } } } // end of namespace sd::slidesorter::view #endif diff --git a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx index 4891da29745a..a873e4e1399e 100644 --- a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx +++ b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "view/SlsInsertAnimator.hxx" #include "controller/SlideSorterController.hxx" #include "controller/SlsAnimationFunction.hxx" @@ -50,7 +49,6 @@ protected: ~AnimatorAccess() {} }; - /** Controller of the position offsets of all page objects in one row or one column. */ @@ -105,7 +103,6 @@ private: }; typedef ::boost::shared_ptr<PageObjectRun> SharedPageObjectRun; - Point Blend (const Point& rPointA, const Point& rPointB, const double nT) { return Point( @@ -115,8 +112,6 @@ Point Blend (const Point& rPointA, const Point& rPointB, const double nT) } // end of anonymous namespace - - class InsertAnimator::Implementation : public AnimatorAccess { public: @@ -151,10 +146,6 @@ private: RunContainer::const_iterator FindRun (const sal_Int32 nRunIndex) const; }; - - - - //===== InsertAnimator ======================================================== InsertAnimator::InsertAnimator (SlideSorter& rSlideSorter) @@ -162,25 +153,16 @@ InsertAnimator::InsertAnimator (SlideSorter& rSlideSorter) { } - - - void InsertAnimator::SetInsertPosition (const InsertPosition& rInsertPosition) { mpImplementation->SetInsertPosition(rInsertPosition, controller::Animator::AM_Animated); } - - - void InsertAnimator::Reset (const controller::Animator::AnimationMode eMode) { mpImplementation->SetInsertPosition(InsertPosition(), eMode); } - - - //===== InsertAnimator::Implementation ======================================== InsertAnimator::Implementation::Implementation (SlideSorter& rSlideSorter) @@ -193,17 +175,11 @@ InsertAnimator::Implementation::Implementation (SlideSorter& rSlideSorter) { } - - - InsertAnimator::Implementation::~Implementation (void) { SetInsertPosition(InsertPosition(), controller::Animator::AM_Immediate); } - - - void InsertAnimator::Implementation::SetInsertPosition ( const InsertPosition& rInsertPosition, const controller::Animator::AnimationMode eMode) @@ -229,9 +205,6 @@ void InsertAnimator::Implementation::SetInsertPosition ( } } - - - SharedPageObjectRun InsertAnimator::Implementation::GetRun ( view::Layouter& rLayouter, const InsertPosition& rInsertPosition, @@ -279,9 +252,6 @@ SharedPageObjectRun InsertAnimator::Implementation::GetRun ( return SharedPageObjectRun(); } - - - InsertAnimator::Implementation::RunContainer::const_iterator InsertAnimator::Implementation::FindRun (const sal_Int32 nRunIndex) const { @@ -294,9 +264,6 @@ InsertAnimator::Implementation::RunContainer::const_iterator nRunIndex)); } - - - void InsertAnimator::Implementation::AddRun (const ::boost::shared_ptr<PageObjectRun> pRun) { if (pRun) @@ -309,10 +276,6 @@ void InsertAnimator::Implementation::AddRun (const ::boost::shared_ptr<PageObjec } } - - - - void InsertAnimator::Implementation::RemoveRun (const ::boost::shared_ptr<PageObjectRun> pRun) { if (pRun) @@ -334,10 +297,6 @@ void InsertAnimator::Implementation::RemoveRun (const ::boost::shared_ptr<PageOb } } - - - - //===== PageObjectRun ========================================================= PageObjectRun::PageObjectRun ( @@ -362,9 +321,6 @@ PageObjectRun::PageObjectRun ( maEndOffset.resize(nEndIndex - nStartIndex + 1); } - - - PageObjectRun::~PageObjectRun (void) { } @@ -400,9 +356,6 @@ void PageObjectRun::UpdateOffsets( } } - - - void PageObjectRun::ResetOffsets (const controller::Animator::AnimationMode eMode) { mnLocalInsertIndex = -1; @@ -432,9 +385,6 @@ void PageObjectRun::ResetOffsets (const controller::Animator::AnimationMode eMod mrAnimatorAccess.RemoveRun(shared_from_this()); } - - - void PageObjectRun::RestartAnimation (void) { // Stop the current animation. @@ -455,9 +405,6 @@ void PageObjectRun::RestartAnimation (void) shared_from_this())); } - - - void PageObjectRun::operator () (const double nGlobalTime) { if (mnStartTime < 0) @@ -494,9 +441,6 @@ void PageObjectRun::operator () (const double nGlobalTime) mrAnimatorAccess.GetContentWindow()->Flush(); } - - - } } } // end of namespace ::sd::slidesorter::view /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx index 5860d341e6ca..2863232ba22e 100644 --- a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx +++ b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "view/SlsInsertionIndicatorOverlay.hxx" #include "SlideSorter.hxx" @@ -40,14 +39,10 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> - namespace { - static const double gnPreviewOffsetScale = 1.0 / 8.0; - - Rectangle GrowRectangle (const Rectangle& rBox, const sal_Int32 nOffset) { return Rectangle ( @@ -61,10 +56,8 @@ sal_Int32 RoundToInt (const double nValue) { return sal_Int32(::rtl::math::round } // end of anonymous namespace - namespace sd { namespace slidesorter { namespace view { - //===== InsertionIndicatorOverlay =========================================== const static sal_Int32 gnShadowBorder = 3; @@ -82,17 +75,11 @@ InsertionIndicatorOverlay::InsertionIndicatorOverlay (SlideSorter& rSlideSorter) { } - - - InsertionIndicatorOverlay::~InsertionIndicatorOverlay (void) { Hide(); } - - - void InsertionIndicatorOverlay::Create (const SdTransferable* pTransferable) { if (pTransferable == NULL) @@ -118,9 +105,6 @@ void InsertionIndicatorOverlay::Create (const SdTransferable* pTransferable) Create(pData->GetRepresentatives(), nSelectionCount); } - - - void InsertionIndicatorOverlay::Create ( const ::std::vector<controller::TransferableData::Representative>& rRepresentatives, const sal_Int32 nSelectionCount) @@ -166,9 +150,6 @@ void InsertionIndicatorOverlay::Create ( maIcon.Scale(aIconSize); } - - - Point InsertionIndicatorOverlay::PaintRepresentatives ( OutputDevice& rContent, const Size aPreviewSize, @@ -255,9 +236,6 @@ Point InsertionIndicatorOverlay::PaintRepresentatives ( return aPageOffset; } - - - void InsertionIndicatorOverlay::PaintPageCount ( OutputDevice& rDevice, const sal_Int32 nSelectionCount, @@ -301,9 +279,6 @@ void InsertionIndicatorOverlay::PaintPageCount ( } } - - - void InsertionIndicatorOverlay::SetLocation (const Point& rLocation) { const Point aTopLeft ( @@ -324,9 +299,6 @@ void InsertionIndicatorOverlay::SetLocation (const Point& rLocation) } } - - - void InsertionIndicatorOverlay::Paint ( OutputDevice& rDevice, const Rectangle& rRepaintArea) @@ -339,9 +311,6 @@ void InsertionIndicatorOverlay::Paint ( rDevice.DrawImage(maLocation, Image(maIcon)); } - - - void InsertionIndicatorOverlay::SetLayerInvalidator (const SharedILayerInvalidator& rpInvalidator) { mpLayerInvalidator = rpInvalidator; @@ -350,13 +319,6 @@ void InsertionIndicatorOverlay::SetLayerInvalidator (const SharedILayerInvalidat mpLayerInvalidator->Invalidate(GetBoundingBox()); } - - - - - - - void InsertionIndicatorOverlay::Show (void) { if ( ! mbIsVisible) @@ -374,9 +336,6 @@ void InsertionIndicatorOverlay::Show (void) } } - - - void InsertionIndicatorOverlay::Hide (void) { if (mbIsVisible) @@ -394,17 +353,11 @@ void InsertionIndicatorOverlay::Hide (void) } } - - - Rectangle InsertionIndicatorOverlay::GetBoundingBox (void) const { return Rectangle(maLocation, maIcon.GetSizePixel()); } - - - Size InsertionIndicatorOverlay::GetSize (void) const { return Size( @@ -412,8 +365,6 @@ Size InsertionIndicatorOverlay::GetSize (void) const maIcon.GetSizePixel().Height() + 10); } - - } } } // end of namespace ::sd::slidesorter::view /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx index 034315e9e139..72fdfe636695 100644 --- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx +++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "SlsLayeredDevice.hxx" #include <vcl/window.hxx> @@ -75,7 +74,6 @@ void DeviceCopy ( rSourceDevice); } - void ForAllRectangles (const Region& rRegion, ::boost::function<void(const Rectangle&)> aFunction) { OSL_ASSERT(aFunction); @@ -130,10 +128,8 @@ private: }; typedef ::boost::shared_ptr<Layer> SharedLayer; - } // end of anonymous namespace - class LayeredDevice::LayerContainer : public ::std::vector<SharedLayer> { public: @@ -141,9 +137,6 @@ public: ~LayerContainer (void) {} }; - - - //===== LayeredDevice ========================================================= LayeredDevice::LayeredDevice (const SharedSdWindow& rpTargetWindow) @@ -155,16 +148,10 @@ LayeredDevice::LayeredDevice (const SharedSdWindow& rpTargetWindow) mpBackBuffer->SetOutputSizePixel(mpTargetWindow->GetSizePixel()); } - - - LayeredDevice::~LayeredDevice (void) { } - - - void LayeredDevice::Invalidate ( const Rectangle& rInvalidationArea, const sal_Int32 nLayer) @@ -178,27 +165,18 @@ void LayeredDevice::Invalidate ( (*mpLayers)[nLayer]->InvalidateRectangle(rInvalidationArea); } - - - void LayeredDevice::InvalidateAllLayers (const Rectangle& rInvalidationArea) { for (sal_uInt32 nLayer=0; nLayer<mpLayers->size(); ++nLayer) (*mpLayers)[nLayer]->InvalidateRectangle(rInvalidationArea); } - - - void LayeredDevice::InvalidateAllLayers (const Region& rInvalidationRegion) { for (sal_uInt32 nLayer=0; nLayer<mpLayers->size(); ++nLayer) (*mpLayers)[nLayer]->InvalidateRegion(rInvalidationRegion); } - - - void LayeredDevice::RegisterPainter ( const SharedILayerPainter& rpPainter, const sal_Int32 nLayer) @@ -233,9 +211,6 @@ void LayeredDevice::RegisterPainter ( SharedILayerInvalidator(new LayerInvalidator(shared_from_this(),mpTargetWindow,nLayer))); } - - - void LayeredDevice::RemovePainter ( const SharedILayerPainter& rpPainter, const sal_Int32 nLayer) @@ -260,9 +235,6 @@ void LayeredDevice::RemovePainter ( mpLayers->erase(mpLayers->end()-1); } - - - void LayeredDevice::Repaint (const Region& rRepaintRegion) { // Validate the contents of all layers (that have their own devices.) @@ -274,9 +246,6 @@ void LayeredDevice::Repaint (const Region& rRepaintRegion) ForAllRectangles(rRepaintRegion, ::boost::bind(&LayeredDevice::RepaintRectangle, this, _1)); } - - - void LayeredDevice::RepaintRectangle (const Rectangle& rRepaintRectangle) { if (mpLayers->empty()) @@ -301,9 +270,6 @@ void LayeredDevice::RepaintRectangle (const Rectangle& rRepaintRectangle) } } - - - void LayeredDevice::Resize (void) { const Size aSize (mpTargetWindow->GetSizePixel()); @@ -311,18 +277,12 @@ void LayeredDevice::Resize (void) ::std::for_each(mpLayers->begin(), mpLayers->end(), ::boost::bind(&Layer::Resize, _1, aSize)); } - - - void LayeredDevice::Dispose (void) { ::std::for_each(mpLayers->begin(), mpLayers->end(), ::boost::bind(&Layer::Dispose, _1)); mpLayers->clear(); } - - - bool LayeredDevice::HandleMapModeChange (void) { const MapMode& rMapMode (mpTargetWindow->GetMapMode()); @@ -386,9 +346,6 @@ bool LayeredDevice::HandleMapModeChange (void) return true; } - - - //===== Layer ================================================================= Layer::Layer (void) @@ -398,16 +355,10 @@ Layer::Layer (void) { } - - - Layer::~Layer (void) { } - - - void Layer::Initialize (const SharedSdWindow& rpTargetWindow) { #if 0 @@ -421,25 +372,16 @@ void Layer::Initialize (const SharedSdWindow& rpTargetWindow) #endif } - - - void Layer::InvalidateRectangle (const Rectangle& rInvalidationBox) { maInvalidationRegion.Union(rInvalidationBox); } - - - void Layer::InvalidateRegion (const Region& rInvalidationRegion) { maInvalidationRegion.Union(rInvalidationRegion); } - - - void Layer::Validate (const MapMode& rMapMode) { if (mpLayerDevice && ! maInvalidationRegion.IsEmpty()) @@ -454,9 +396,6 @@ void Layer::Validate (const MapMode& rMapMode) } } - - - void Layer::ValidateRectangle (const Rectangle& rBox) { if ( ! mpLayerDevice) @@ -476,9 +415,6 @@ void Layer::ValidateRectangle (const Rectangle& rBox) mpLayerDevice->SetClipRegion(aSavedClipRegion); } - - - void Layer::Repaint ( OutputDevice& rTargetDevice, const Rectangle& rRepaintRectangle) @@ -499,9 +435,6 @@ void Layer::Repaint ( } } - - - void Layer::Resize (const Size& rSize) { if (mpLayerDevice) @@ -511,9 +444,6 @@ void Layer::Resize (const Size& rSize) } } - - - void Layer::AddPainter (const SharedILayerPainter& rpPainter) { OSL_ASSERT(::std::find(maPainters.begin(), maPainters.end(), rpPainter) == maPainters.end()); @@ -521,9 +451,6 @@ void Layer::AddPainter (const SharedILayerPainter& rpPainter) maPainters.push_back(rpPainter); } - - - void Layer::RemovePainter (const SharedILayerPainter& rpPainter) { const ::std::vector<SharedILayerPainter>::iterator iPainter ( @@ -538,23 +465,16 @@ void Layer::RemovePainter (const SharedILayerPainter& rpPainter) } } - - - bool Layer::HasPainter (void) const { return !maPainters.empty(); } - - - void Layer::Dispose (void) { maPainters.clear(); } - } } } // end of namespace ::sd::slidesorter::view /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx index 8d42e90d1053..1cf5ea439bd6 100644 --- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx +++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx @@ -81,8 +81,6 @@ private: void RepaintRectangle (const Rectangle& rRepaintRectangle); }; - - } } } // end of namespace ::sd::slidesorter::view #endif diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx index fca5a7ebbfea..2e298bd4c138 100644 --- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx +++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "view/SlsLayouter.hxx" #include "model/SlideSorterModel.hxx" #include "model/SlsPageDescriptor.hxx" @@ -220,7 +219,6 @@ protected: InsertPosition& rPosition) const; }; - /** The vertical layouter has one column and as many rows as there are pages. */ @@ -243,7 +241,6 @@ protected: const Size& rPreviewModelSize) const SAL_OVERRIDE; }; - /** The horizontal layouter has one row and as many columns as there are pages. */ @@ -266,7 +263,6 @@ protected: const Size& rPreviewModelSize) const SAL_OVERRIDE; }; - /** The number of columns of the grid layouter is defined via a control in the slide sorter tool bar. The number of rows is calculated from the number of columns and the number of pages. @@ -293,9 +289,6 @@ protected: const Size& rPreviewModelSize) const SAL_OVERRIDE; }; - - - //===== Layouter ============================================================== Layouter::Layouter ( @@ -306,24 +299,15 @@ Layouter::Layouter ( { } - - - Layouter::~Layouter (void) { } - - - ::boost::shared_ptr<PageObjectLayouter> Layouter::GetPageObjectLayouter (void) const { return mpImplementation->mpPageObjectLayouter; } - - - void Layouter::SetColumnCount ( sal_Int32 nMinimalColumnCount, sal_Int32 nMaximalColumnCount) @@ -335,9 +319,6 @@ void Layouter::SetColumnCount ( } } - - - bool Layouter::Rearrange ( const Orientation eOrientation, const Size& rWindowSize, @@ -357,25 +338,16 @@ sal_Int32 Layouter::GetColumnCount (void) const return mpImplementation->mnColumnCount; } - - - sal_Int32 Layouter::GetIndex (const sal_Int32 nRow, const sal_Int32 nColumn) const { return mpImplementation->GetIndex(nRow,nColumn,true); } - - - Size Layouter::GetPageObjectSize (void) const { return mpImplementation->maPageObjectSize; } - - - Rectangle Layouter::GetPageObjectBox ( const sal_Int32 nIndex, const bool bIncludeBorderAndGap) const @@ -383,17 +355,11 @@ Rectangle Layouter::GetPageObjectBox ( return mpImplementation->GetPageObjectBox(nIndex, bIncludeBorderAndGap); } - - - Rectangle Layouter::GetTotalBoundingBox (void) const { return mpImplementation->GetTotalBoundingBox(); } - - - InsertPosition Layouter::GetInsertPosition ( const Point& rModelPosition, const Size& rIndicatorSize, @@ -411,33 +377,21 @@ InsertPosition Layouter::GetInsertPosition ( return aPosition; } - - - Range Layouter::GetValidHorizontalSizeRange (void) const { return mpImplementation->GetValidHorizontalSizeRange(); } - - - Range Layouter::GetValidVerticalSizeRange (void) const { return mpImplementation->GetValidVerticalSizeRange(); } - - - Range Layouter::GetRangeOfVisiblePageObjects (const Rectangle& aVisibleArea) const { return mpImplementation->GetRangeOfVisiblePageObjects(aVisibleArea); } - - - sal_Int32 Layouter::GetIndexAtPoint ( const Point& rPosition, const bool bIncludePageBorders, @@ -457,9 +411,6 @@ sal_Int32 Layouter::GetIndexAtPoint ( return mpImplementation->GetIndex(nRow,nColumn,bClampToValidRange); } - - - //===== Layouter::Implementation ============================================== Layouter::Implementation* Layouter::Implementation::Create ( @@ -475,9 +426,6 @@ Layouter::Implementation* Layouter::Implementation::Create ( } } - - - Layouter::Implementation::Implementation ( const SharedSdWindow& rpWindow, const ::boost::shared_ptr<view::Theme>& rpTheme) @@ -508,9 +456,6 @@ Layouter::Implementation::Implementation ( { } - - - Layouter::Implementation::Implementation (const Implementation& rImplementation) : mpWindow(rImplementation.mpWindow), mnRequestedLeftBorder(rImplementation.mnRequestedLeftBorder), @@ -539,16 +484,10 @@ Layouter::Implementation::Implementation (const Implementation& rImplementation) { } - - - Layouter::Implementation::~Implementation (void) { } - - - bool Layouter::Implementation::Rearrange ( const Size& rWindowSize, const Size& rPreviewModelSize, @@ -601,9 +540,6 @@ bool Layouter::Implementation::Rearrange ( return true; } - - - sal_Int32 Layouter::Implementation::GetRowAtPosition ( sal_Int32 nYPosition, bool bIncludeBordersAndGaps, @@ -640,9 +576,6 @@ sal_Int32 Layouter::Implementation::GetRowAtPosition ( return nRow; } - - - sal_Int32 Layouter::Implementation::GetColumnAtPosition ( sal_Int32 nXPosition, bool bIncludeBordersAndGaps, @@ -683,9 +616,6 @@ sal_Int32 Layouter::Implementation::GetColumnAtPosition ( return nColumn; } - - - sal_Int32 Layouter::Implementation::ResolvePositionInGap ( sal_Int32 nDistanceIntoGap, GapMembership eGapMembership, @@ -740,9 +670,6 @@ sal_Int32 Layouter::Implementation::ResolvePositionInGap ( return nIndex; } - - - void Layouter::Implementation::CalculateGeometricPosition ( InsertPosition& rPosition, const Size& rIndicatorSize, @@ -860,9 +787,6 @@ void Layouter::Implementation::CalculateGeometricPosition ( } } - - - Rectangle Layouter::Implementation::GetInnerBoundingBox ( model::SlideSorterModel& rModel, const sal_Int32 nIndex) const @@ -881,9 +805,6 @@ Rectangle Layouter::Implementation::GetInnerBoundingBox ( PageObjectLayouter::ModelCoordinateSystem, true); } - - - Range Layouter::Implementation::GetValidHorizontalSizeRange (void) const { return Range( @@ -891,9 +812,6 @@ Range Layouter::Implementation::GetValidHorizontalSizeRange (void) const mnLeftBorder + maMaximalSize.Width() + mnRightBorder); } - - - Range Layouter::Implementation::GetValidVerticalSizeRange (void) const { return Range( @@ -901,9 +819,6 @@ Range Layouter::Implementation::GetValidVerticalSizeRange (void) const mnTopBorder + maMaximalSize.Height() + mnBottomBorder); } - - - Range Layouter::Implementation::GetRangeOfVisiblePageObjects (const Rectangle& aVisibleArea) const { const sal_Int32 nRow0 (GetRowAtPosition(aVisibleArea.Top(), true, GM_NEXT)); @@ -916,9 +831,6 @@ Range Layouter::Implementation::GetRangeOfVisiblePageObjects (const Rectangle& a return Range(GetIndex(nRow0,nCol0,true), GetIndex(nRow1,nCol1,true)); } - - - Size Layouter::Implementation::GetTargetSize ( const Size& rWindowSize, const Size& rPreviewModelSize, @@ -966,9 +878,6 @@ Size Layouter::Implementation::GetTargetSize ( return aTargetSize; } - - - sal_Int32 Layouter::Implementation::GetIndex ( const sal_Int32 nRow, const sal_Int32 nColumn, @@ -991,9 +900,6 @@ sal_Int32 Layouter::Implementation::GetIndex ( return -1; } - - - Rectangle Layouter::Implementation::GetPageObjectBox ( const sal_Int32 nIndex, const bool bIncludeBorderAndGap) const @@ -1008,9 +914,6 @@ Rectangle Layouter::Implementation::GetPageObjectBox ( return aBoundingBox; } - - - Rectangle Layouter::Implementation::GetPageObjectBox ( const sal_Int32 nRow, const sal_Int32 nColumn) const @@ -1025,10 +928,6 @@ Rectangle Layouter::Implementation::GetPageObjectBox ( maPageObjectSize); } - - - - Rectangle Layouter::Implementation::AddBorderAndGap ( const Rectangle& rBoundingBox, const sal_Int32 nRow, @@ -1055,9 +954,6 @@ Rectangle Layouter::Implementation::AddBorderAndGap ( return aBoundingBox; } - - - Rectangle Layouter::Implementation::GetTotalBoundingBox (void) const { sal_Int32 nHorizontalSize = 0; @@ -1085,9 +981,6 @@ Rectangle Layouter::Implementation::GetTotalBoundingBox (void) const ); } - - - void Layouter::Implementation::CalculateVerticalLogicalInsertPosition ( const Point& rModelPosition, InsertPosition& rPosition) const @@ -1104,9 +997,6 @@ void Layouter::Implementation::CalculateVerticalLogicalInsertPosition ( (nRow >= mnMaxRowCount)); } - - - //===== HorizontalImplementation ================================================ HorizontalImplementation::HorizontalImplementation (const Implementation& rImplementation) @@ -1114,17 +1004,11 @@ HorizontalImplementation::HorizontalImplementation (const Implementation& rImple { } - - - Layouter::Orientation HorizontalImplementation::GetOrientation (void) const { return Layouter::HORIZONTAL; } - - - void HorizontalImplementation::CalculateRowAndColumnCount (const Size& rWindowSize) { (void)rWindowSize; @@ -1134,9 +1018,6 @@ void HorizontalImplementation::CalculateRowAndColumnCount (const Size& rWindowSi mnRowCount = 1; } - - - void HorizontalImplementation::CalculateMaxRowAndColumnCount (const Size& rWindowSize) { mnMaxColumnCount = (rWindowSize.Width() - mnLeftBorder - mnRightBorder) @@ -1144,9 +1025,6 @@ void HorizontalImplementation::CalculateMaxRowAndColumnCount (const Size& rWindo mnMaxRowCount = 1; } - - - Size HorizontalImplementation::CalculateTargetSize ( const Size& rWindowSize, const Size& rPreviewModelSize) const @@ -1154,9 +1032,6 @@ Size HorizontalImplementation::CalculateTargetSize ( return Implementation::GetTargetSize(rWindowSize, rPreviewModelSize, false, true); } - - - void HorizontalImplementation::CalculateLogicalInsertPosition ( const Point& rModelPosition, InsertPosition& rPosition) const @@ -1173,9 +1048,6 @@ void HorizontalImplementation::CalculateLogicalInsertPosition ( (nColumn >= mnMaxColumnCount)); } - - - //===== VerticalImplementation ================================================ VerticalImplementation::VerticalImplementation (const Implementation& rImplementation) @@ -1183,17 +1055,11 @@ VerticalImplementation::VerticalImplementation (const Implementation& rImplement { } - - - Layouter::Orientation VerticalImplementation::GetOrientation (void) const { return Layouter::VERTICAL; } - - - void VerticalImplementation::CalculateRowAndColumnCount (const Size& rWindowSize) { (void)rWindowSize; @@ -1204,9 +1070,6 @@ void VerticalImplementation::CalculateRowAndColumnCount (const Size& rWindowSize } - - - void VerticalImplementation::CalculateMaxRowAndColumnCount (const Size& rWindowSize) { mnMaxRowCount = (rWindowSize.Height() - mnTopBorder - mnBottomBorder) @@ -1214,9 +1077,6 @@ void VerticalImplementation::CalculateMaxRowAndColumnCount (const Size& rWindowS mnMaxColumnCount = 1; } - - - Size VerticalImplementation::CalculateTargetSize ( const Size& rWindowSize, const Size& rPreviewModelSize) const @@ -1224,9 +1084,6 @@ Size VerticalImplementation::CalculateTargetSize ( return Implementation::GetTargetSize(rWindowSize, rPreviewModelSize, true, false); } - - - void VerticalImplementation::CalculateLogicalInsertPosition ( const Point& rModelPosition, InsertPosition& rPosition) const @@ -1234,9 +1091,6 @@ void VerticalImplementation::CalculateLogicalInsertPosition ( return CalculateVerticalLogicalInsertPosition(rModelPosition, rPosition); } - - - //===== GridImplementation ================================================ GridImplementation::GridImplementation ( @@ -1246,25 +1100,16 @@ GridImplementation::GridImplementation ( { } - - - GridImplementation::GridImplementation (const Implementation& rImplementation) : Implementation(rImplementation) { } - - - Layouter::Orientation GridImplementation::GetOrientation (void) const { return Layouter::GRID; } - - - void GridImplementation::CalculateRowAndColumnCount (const Size& rWindowSize) { // Calculate the column count. @@ -1278,9 +1123,6 @@ void GridImplementation::CalculateRowAndColumnCount (const Size& rWindowSize) mnRowCount = (mnPageCount + mnColumnCount-1)/mnColumnCount; } - - - void GridImplementation::CalculateMaxRowAndColumnCount (const Size& rWindowSize) { mnMaxColumnCount = (rWindowSize.Width() - mnLeftBorder - mnRightBorder) @@ -1289,10 +1131,6 @@ void GridImplementation::CalculateMaxRowAndColumnCount (const Size& rWindowSize) / (maPageObjectSize.Height() + mnVerticalGap); } - - - - Size GridImplementation::CalculateTargetSize ( const Size& rWindowSize, const Size& rPreviewModelSize) const @@ -1300,9 +1138,6 @@ Size GridImplementation::CalculateTargetSize ( return Implementation::GetTargetSize(rWindowSize, rPreviewModelSize, true, true); } - - - void GridImplementation::CalculateLogicalInsertPosition ( const Point& rModelPosition, InsertPosition& rPosition) const @@ -1341,9 +1176,6 @@ void GridImplementation::CalculateLogicalInsertPosition ( } } - - - //===== InsertPosition ======================================================== InsertPosition::InsertPosition (void) @@ -1359,9 +1191,6 @@ InsertPosition::InsertPosition (void) { } - - - InsertPosition& InsertPosition::operator= (const InsertPosition& rInsertPosition) { if (this != &rInsertPosition) @@ -1379,9 +1208,6 @@ InsertPosition& InsertPosition::operator= (const InsertPosition& rInsertPosition return *this; } - - - bool InsertPosition::operator== (const InsertPosition& rInsertPosition) const { // Do not compare the geometrical information (maLocation). @@ -1393,17 +1219,11 @@ bool InsertPosition::operator== (const InsertPosition& rInsertPosition) const && mbIsExtraSpaceNeeded==rInsertPosition.mbIsExtraSpaceNeeded; } - - - bool InsertPosition::operator!= (const InsertPosition& rInsertPosition) const { return !operator==(rInsertPosition); } - - - void InsertPosition::SetLogicalPosition ( const sal_Int32 nRow, const sal_Int32 nColumn, @@ -1420,9 +1240,6 @@ void InsertPosition::SetLogicalPosition ( mbIsExtraSpaceNeeded = bIsExtraSpaceNeeded; } - - - void InsertPosition::SetGeometricalPosition( const Point aLocation, const Point aLeadingOffset, @@ -1433,8 +1250,6 @@ void InsertPosition::SetGeometricalPosition( maTrailingOffset = aTrailingOffset; } - - } } } // end of namespace ::sd::slidesorter::namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx index 1c35614df8d8..b056787b3a53 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "view/SlsPageObjectLayouter.hxx" #include "model/SlsPageDescriptor.hxx" @@ -92,16 +91,10 @@ PageObjectLayouter::PageObjectLayouter ( aIconSize); } - - - PageObjectLayouter::~PageObjectLayouter(void) { } - - - Rectangle PageObjectLayouter::CalculatePreviewBoundingBox ( Size& rPageObjectSize, const Size& rPageSize, diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx index 5f0d8ecedad0..3e7fe0ddd62d 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx @@ -38,7 +38,6 @@ using namespace ::drawinglayer::primitive2d; - namespace sd { namespace slidesorter { namespace view { //===== PageObjectPainter ===================================================== @@ -62,15 +61,10 @@ PageObjectPainter::PageObjectPainter ( mpFocusBorderPainter->AdaptColor(aColor, true); } - - PageObjectPainter::~PageObjectPainter (void) { } - - - void PageObjectPainter::PaintPageObject ( OutputDevice& rDevice, const model::SharedPageDescriptor& rpDescriptor) @@ -93,9 +87,6 @@ void PageObjectPainter::PaintPageObject ( } } - - - bool PageObjectPainter::UpdatePageObjectLayouter (void) { // The page object layouter is quite volatile. It may have been replaced @@ -149,9 +140,6 @@ void PageObjectPainter::PaintBackground ( } } - - - void PageObjectPainter::PaintPreview ( PageObjectLayouter *pPageObjectLayouter, OutputDevice& rDevice, @@ -178,9 +166,6 @@ void PageObjectPainter::PaintPreview ( } } - - - Bitmap PageObjectPainter::CreateMarkedPreview ( const Size& rSize, const Bitmap& rPreview, @@ -208,9 +193,6 @@ Bitmap PageObjectPainter::CreateMarkedPreview ( return pDevice->GetBitmap(Point(0,0), rSize); } - - - Bitmap PageObjectPainter::GetPreviewBitmap ( const model::SharedPageDescriptor& rpDescriptor, const OutputDevice* pReferenceDevice) const @@ -244,9 +226,6 @@ Bitmap PageObjectPainter::GetPreviewBitmap ( } } - - - void PageObjectPainter::PaintPageNumber ( PageObjectLayouter *pPageObjectLayouter, OutputDevice& rDevice, @@ -300,9 +279,6 @@ void PageObjectPainter::PaintPageNumber ( rDevice.DrawText(aBox, sPageNumber, TEXT_DRAW_RIGHT | TEXT_DRAW_VCENTER); } - - - void PageObjectPainter::PaintTransitionEffect ( PageObjectLayouter *pPageObjectLayouter, OutputDevice& rDevice, @@ -497,8 +473,6 @@ void PageObjectPainter::PaintBorder ( } } - - } } } // end of namespace sd::slidesorter::view /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/view/SlsResource.hxx b/sd/source/ui/slidesorter/view/SlsResource.hxx index 72377f1a07d0..9869e0339b3e 100644 --- a/sd/source/ui/slidesorter/view/SlsResource.hxx +++ b/sd/source/ui/slidesorter/view/SlsResource.hxx @@ -33,7 +33,6 @@ public: ~LocalResource (void) { FreeResource(); } }; - } } } // end of namespace ::sd::slidesorter::view #endif diff --git a/sd/source/ui/slidesorter/view/SlsTheme.cxx b/sd/source/ui/slidesorter/view/SlsTheme.cxx index 3ac38ccd010d..a0ce837beaf0 100644 --- a/sd/source/ui/slidesorter/view/SlsTheme.cxx +++ b/sd/source/ui/slidesorter/view/SlsTheme.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "view/SlsTheme.hxx" #include "SlsResource.hxx" #include "controller/SlsProperties.hxx" @@ -35,8 +34,6 @@ namespace sd { namespace slidesorter { namespace view { const static ColorData Black = 0x000000; const static ColorData White = 0xffffff; - - ColorData ChangeLuminance (const ColorData aColorData, const int nValue) { Color aColor (aColorData); @@ -62,9 +59,6 @@ ColorData HGBAdapt ( nNewBrightness>=0 ? nNewBrightness : nBrightness); } - - - Theme::Theme (const ::boost::shared_ptr<controller::Properties>& rpProperties) : maBackgroundColor(rpProperties->GetBackgroundColor().GetColor()), maPageBackgroundColor(COL_WHITE), @@ -88,9 +82,6 @@ Theme::Theme (const ::boost::shared_ptr<controller::Properties>& rpProperties) Update(rpProperties); } - - - void Theme::Update (const ::boost::shared_ptr<controller::Properties>& rpProperties) { // Set up colors. @@ -137,9 +128,6 @@ void Theme::Update (const ::boost::shared_ptr<controller::Properties>& rpPropert } } - - - ::boost::shared_ptr<Font> Theme::GetFont ( const FontType eType, const OutputDevice& rDevice) @@ -178,9 +166,6 @@ void Theme::Update (const ::boost::shared_ptr<controller::Properties>& rpPropert return pFont; } - - - ColorData Theme::GetColor (const ColorType eType) { if (eType>=0 && sal_uInt32(eType)<maColor.size()) @@ -189,9 +174,6 @@ ColorData Theme::GetColor (const ColorType eType) return 0; } - - - ColorData Theme::GetGradientColor ( const GradientColorType eType, const GradientColorClass eClass) @@ -209,9 +191,6 @@ ColorData Theme::GetGradientColor ( } } - - - void Theme::SetGradient ( const GradientColorType eType, const ColorData aBaseColor, @@ -243,9 +222,6 @@ void Theme::SetGradient ( rGradient.mnBorderOffset2 = nBorderEndOffset; } - - - const BitmapEx& Theme::GetIcon (const IconType eType) { if (eType>=0 && size_t(eType)<maIcons.size()) @@ -257,9 +233,6 @@ const BitmapEx& Theme::GetIcon (const IconType eType) } } - - - Theme::GradientDescriptor& Theme::GetGradient (const GradientColorType eType) { if (eType>=0 && size_t(eType)<maGradients.size()) @@ -271,9 +244,6 @@ Theme::GradientDescriptor& Theme::GetGradient (const GradientColorType eType) } } - - - void Theme::InitializeIcon (const IconType eType, sal_uInt16 nResourceId) { if (eType>=0 && size_t(eType)<maIcons.size()) @@ -287,9 +257,6 @@ void Theme::InitializeIcon (const IconType eType, sal_uInt16 nResourceId) } } - - - } } } // end of namespace ::sd::slidesorter::view /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/view/SlsToolTip.cxx b/sd/source/ui/slidesorter/view/SlsToolTip.cxx index 4f146193ae3a..4e5629b2a825 100644 --- a/sd/source/ui/slidesorter/view/SlsToolTip.cxx +++ b/sd/source/ui/slidesorter/view/SlsToolTip.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "view/SlsToolTip.hxx" #include "view/SlideSorterView.hxx" #include "view/SlsLayouter.hxx" @@ -45,9 +44,6 @@ ToolTip::ToolTip (SlideSorter& rSlideSorter) maHiddenTimer.SetTimeout(rHelpSettings.GetTipDelay()); } - - - ToolTip::~ToolTip (void) { maShowTimer.Stop(); @@ -55,7 +51,6 @@ ToolTip::~ToolTip (void) Hide(); } - void ToolTip::SetPage (const model::SharedPageDescriptor& rpDescriptor) { if (mpDescriptor != rpDescriptor) @@ -97,8 +92,6 @@ void ToolTip::SetPage (const model::SharedPageDescriptor& rpDescriptor) } } - - void ToolTip::Show (const bool bNoDelay) { if (bNoDelay) @@ -107,9 +100,6 @@ void ToolTip::Show (const bool bNoDelay) maShowTimer.Start(); } - - - void ToolTip::DoShow (void) { if (maShowTimer.IsActive()) @@ -152,9 +142,6 @@ void ToolTip::DoShow (void) } } - - - bool ToolTip::Hide (void) { if (mnHelpWindowHandle>0) @@ -167,9 +154,6 @@ bool ToolTip::Hide (void) return false; } - - - IMPL_LINK_NOARG(ToolTip, DelayTrigger) { DoShow(); diff --git a/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx b/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx index 144e71482013..ba109d64aa16 100644 --- a/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx +++ b/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "SlsViewCacheContext.hxx" #include "SlideSorter.hxx" @@ -36,23 +35,16 @@ namespace sd { namespace slidesorter { namespace view { - ViewCacheContext::ViewCacheContext (SlideSorter& rSlideSorter) : mrModel(rSlideSorter.GetModel()), mrSlideSorter(rSlideSorter) { } - - - ViewCacheContext::~ViewCacheContext (void) { } - - - void ViewCacheContext::NotifyPreviewCreation ( cache::CacheKey aKey, const Bitmap&) @@ -71,9 +63,6 @@ void ViewCacheContext::NotifyPreviewCreation ( } } - - - bool ViewCacheContext::IsIdle (void) { sal_Int32 nIdleState (tools::IdleDetection::GetIdleState(mrSlideSorter.GetContentWindow().get())); @@ -83,26 +72,17 @@ bool ViewCacheContext::IsIdle (void) return false; } - - - bool ViewCacheContext::IsVisible (cache::CacheKey aKey) { const model::SharedPageDescriptor pDescriptor (GetDescriptor(aKey)); return pDescriptor && pDescriptor->HasState(model::PageDescriptor::ST_Visible); } - - - const SdrPage* ViewCacheContext::GetPage (cache::CacheKey aKey) { return static_cast<const SdrPage*>(aKey); } - - - ::boost::shared_ptr<std::vector<cache::CacheKey> > ViewCacheContext::GetEntryList (bool bVisible) { ::boost::shared_ptr<std::vector<cache::CacheKey> > pKeys (new std::vector<cache::CacheKey>()); @@ -121,26 +101,17 @@ const SdrPage* ViewCacheContext::GetPage (cache::CacheKey aKey) return pKeys; } - - - sal_Int32 ViewCacheContext::GetPriority (cache::CacheKey aKey) { return - (static_cast<const SdrPage*>(aKey)->GetPageNum()-1) / 2; } - - - model::SharedPageDescriptor ViewCacheContext::GetDescriptor (cache::CacheKey aKey) { sal_uInt16 nPageIndex ((static_cast<const SdrPage*>(aKey)->GetPageNum() - 1) / 2); return mrModel.GetPageDescriptor(nPageIndex); } - - - ::com::sun::star::uno::Reference<com::sun::star::uno::XInterface> ViewCacheContext::GetModel (void) { if (mrModel.GetDocument() == NULL) diff --git a/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx b/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx index c5523320f14e..14ee3ca65fa2 100644 --- a/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx +++ b/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx @@ -56,7 +56,6 @@ private: model::SharedPageDescriptor GetDescriptor (cache::CacheKey aKey); }; - } } } // end of namespace ::sd::slidesorter::view #endif diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index a72d8e6e116d..01219e549e07 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "sddll.hxx" #include <com/sun/star/beans/XMultiPropertyStates.hpp> @@ -76,9 +75,6 @@ static const sal_Int32 nCellHeight = 7; // one pixel is shared with the next cel static const sal_Int32 nBitmapWidth = (nCellWidth * nPreviewColumns) - (nPreviewColumns - 1); static const sal_Int32 nBitmapHeight = (nCellHeight * nPreviewRows) - (nPreviewRows - 1); - - - static const OUString* getPropertyNames() { static const OUString gPropNames[ CB_COUNT ] = @@ -93,7 +89,6 @@ static const OUString* getPropertyNames() return &gPropNames[0]; } - TableDesignWidget::TableDesignWidget( VclBuilderContainer* pParent, ViewShellBase& rBase, bool bModal ) : mrBase(rBase) , msTableTemplate("TableTemplate") @@ -144,15 +139,11 @@ TableDesignWidget::TableDesignWidget( VclBuilderContainer* pParent, ViewShellBas updateControls(); } - - TableDesignWidget::~TableDesignWidget() { removeListener(); } - - static SfxBindings* getBindings( ViewShellBase& rBase ) { if( rBase.GetMainViewShell().get() && rBase.GetMainViewShell()->GetViewFrame() ) @@ -161,8 +152,6 @@ static SfxBindings* getBindings( ViewShellBase& rBase ) return 0; } - - static SfxDispatcher* getDispatcher( ViewShellBase& rBase ) { if( rBase.GetMainViewShell().get() && rBase.GetMainViewShell()->GetViewFrame() ) @@ -171,8 +160,6 @@ static SfxDispatcher* getDispatcher( ViewShellBase& rBase ) return 0; } - - IMPL_LINK_NOARG(TableDesignWidget, implValueSetHdl) { mbStyleSelected = true; @@ -181,8 +168,6 @@ IMPL_LINK_NOARG(TableDesignWidget, implValueSetHdl) return 0; } - - void TableDesignWidget::ApplyStyle() { try @@ -232,8 +217,6 @@ void TableDesignWidget::ApplyStyle() } } - - IMPL_LINK_NOARG(TableDesignWidget, implCheckBoxHdl) { mbOptionsChanged = true; @@ -245,8 +228,6 @@ IMPL_LINK_NOARG(TableDesignWidget, implCheckBoxHdl) return 0; } - - void TableDesignWidget::ApplyOptions() { static const sal_uInt16 gParamIds[CB_COUNT] = @@ -283,8 +264,6 @@ void TableDesignWidget::ApplyOptions() } } - - void TableDesignWidget::onSelectionChanged() { Reference< XPropertySet > xNewSelection; @@ -327,8 +306,6 @@ void TableDesignWidget::onSelectionChanged() } } - - void TableValueSet::Resize() { ValueSet::Resize(); @@ -397,8 +374,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT ::Window* SAL_CALL makeTableValueSet(::Window *p return new TableValueSet(pParent, nWinStyle); } - - void TableDesignWidget::updateControls() { static const sal_Bool gDefaults[CB_COUNT] = { sal_True, sal_False, sal_True, sal_False, sal_False, sal_False }; @@ -425,7 +400,6 @@ void TableDesignWidget::updateControls() m_pValueSet->updateSettings(); m_pValueSet->Resize(); - sal_uInt16 nSelection = 0; if( mxSelectedTable.is() ) { @@ -452,8 +426,6 @@ void TableDesignWidget::updateControls() m_pValueSet->SelectItem( nSelection ); } - - void TableDesignWidget::addListener() { Link aLink( LINK(this,TableDesignWidget,EventMultiplexerListener) ); @@ -466,16 +438,12 @@ void TableDesignWidget::addListener() | tools::EventMultiplexerEvent::EID_DISPOSING); } - - void TableDesignWidget::removeListener() { Link aLink( LINK(this,TableDesignWidget,EventMultiplexerListener) ); mrBase.GetEventMultiplexer()->RemoveEventListener( aLink ); } - - IMPL_LINK(TableDesignWidget,EventMultiplexerListener, tools::EventMultiplexerEvent*,pEvent) { @@ -499,8 +467,6 @@ IMPL_LINK(TableDesignWidget,EventMultiplexerListener, return 0; } - - struct CellInfo { Color maCellColor; @@ -536,8 +502,6 @@ CellInfo::CellInfo( const Reference< XStyle >& xStyle ) } } - - typedef std::vector< boost::shared_ptr< CellInfo > > CellInfoVector; typedef boost::shared_ptr< CellInfo > CellInfoMatrix[nPreviewColumns][nPreviewRows]; @@ -559,8 +523,6 @@ struct TableStyleSettings , mbUseColumnBanding(false) {} }; - - static void FillCellInfoVector( const Reference< XIndexAccess >& xTableStyle, CellInfoVector& rVector ) { DBG_ASSERT( xTableStyle.is() && (xTableStyle->getCount() == sdr::table::style_count ), "sd::FillCellInfoVector(), invalid table style!" ); @@ -656,8 +618,6 @@ static void FillCellInfoMatrix( const CellInfoVector& rStyle, const TableStyleSe } } - - const Bitmap CreateDesignPreview( const Reference< XIndexAccess >& xTableStyle, const TableStyleSettings& rSettings, bool bIsPageDark ) { CellInfoVector aCellInfoVector(sdr::table::style_count); @@ -674,7 +634,6 @@ const Bitmap CreateDesignPreview( const Reference< XIndexAccess >& xTableStyle, // bccccccccccb // bbbbbbbbbbbb - Bitmap aPreviewBmp( Size( nBitmapWidth, nBitmapHeight), 24, NULL ); BitmapWriteAccess* pAccess = aPreviewBmp.AcquireWriteAccess(); if( pAccess ) @@ -834,8 +793,6 @@ void TableDesignWidget::FillDesignPreviewControl() m_pValueSet->SelectItem(nSelectedItem); } - - short TableDesignDialog::Execute() { if( ModalDialog::Execute() ) @@ -850,23 +807,17 @@ short TableDesignDialog::Execute() return RET_CANCEL; } - - ::Window * createTableDesignPanel( ::Window* pParent, ViewShellBase& rBase ) { return new TableDesignPane( pParent, rBase ); } - - void showTableDesignDialog( ::Window* pParent, ViewShellBase& rBase ) { boost::scoped_ptr< TableDesignDialog > xDialog( new TableDesignDialog( pParent, rBase ) ); xDialog->Execute(); } - } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/table/TableDesignPane.hxx b/sd/source/ui/table/TableDesignPane.hxx index 496734227367..34b7482d8fb5 100644 --- a/sd/source/ui/table/TableDesignPane.hxx +++ b/sd/source/ui/table/TableDesignPane.hxx @@ -43,8 +43,6 @@ class EventMultiplexerEvent; class ViewShellBase; - - #define CB_HEADER_ROW 0 #define CB_TOTAL_ROW 1 #define CB_BANDED_ROWS 2 @@ -121,8 +119,6 @@ public: } }; - - class TableDesignDialog : public ModalDialog { private: diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx index 55c147943821..87452cc2aa52 100644 --- a/sd/source/ui/table/tablefunction.cxx +++ b/sd/source/ui/table/tablefunction.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <sal/config.h> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/drawing/XSelectionFunction.hpp> @@ -223,8 +222,6 @@ void DrawViewShell::FuTable(SfxRequest& rReq) } } - - void DrawViewShell::GetTableMenuState( SfxItemSet &rSet ) { bool bIsUIActive = GetDocSh()->IsUIActive(); @@ -247,8 +244,6 @@ void DrawViewShell::GetTableMenuState( SfxItemSet &rSet ) } } - - void CreateTableFromRTF( SvStream& rStream, SdDrawDocument* pModel ) { rStream.Seek( 0 ); diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx index 1b71192911dd..942a0cade075 100644 --- a/sd/source/ui/table/tableobjectbar.cxx +++ b/sd/source/ui/table/tableobjectbar.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <sfx2/msg.hxx> #include <sfx2/app.hxx> #include <sfx2/sfxsids.hrc> @@ -59,7 +58,6 @@ using namespace sd::ui::table; #define TableObjectBar #include "sdslots.hxx" - namespace sd { namespace ui { namespace table { /** creates a table object bar for the given ViewShell */ @@ -68,7 +66,6 @@ SfxShell* CreateTableObjectBar( ViewShell& rShell, ::sd::View* pView ) return new TableObjectBar( &rShell, pView ); } - /** registers the interfaces from the table ui */ void RegisterInterfaces(SfxModule* pMod) { @@ -102,8 +99,6 @@ TableObjectBar::TableObjectBar( ViewShell* pSdViewShell, ::sd::View* pSdView ) SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_Table)); } - - TableObjectBar::~TableObjectBar() { SetRepeatTarget( NULL ); @@ -128,8 +123,6 @@ void TableObjectBar::GetAttrState( SfxItemSet& rSet ) pDrawViewShell->GetAttrState( rSet ); } - - void TableObjectBar::Execute( SfxRequest& rReq ) { if( mpView ) diff --git a/sd/source/ui/tools/AsynchronousCall.cxx b/sd/source/ui/tools/AsynchronousCall.cxx index 48e63363e70e..dd444f517fc3 100644 --- a/sd/source/ui/tools/AsynchronousCall.cxx +++ b/sd/source/ui/tools/AsynchronousCall.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "tools/AsynchronousCall.hxx" #include "DrawViewShell.hxx" @@ -32,18 +31,12 @@ AsynchronousCall::AsynchronousCall (void) maTimer.SetTimeoutHdl(aCallback); } - - - AsynchronousCall::~AsynchronousCall (void) { mpFunction.reset(); maTimer.Stop(); } - - - void AsynchronousCall::Post ( const AsynchronousFunction& rFunction, sal_uInt32 nTimeoutInMilliseconds) @@ -53,9 +46,6 @@ void AsynchronousCall::Post ( maTimer.Start(); } - - - IMPL_LINK(AsynchronousCall,TimerCallback,Timer*,pTimer) { if (pTimer == &maTimer) @@ -69,7 +59,6 @@ IMPL_LINK(AsynchronousCall,TimerCallback,Timer*,pTimer) return 0; } - } } // end of namespace ::sd::tools /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/tools/ConfigurationAccess.cxx b/sd/source/ui/tools/ConfigurationAccess.cxx index 1f57fed1d5ed..eb22a2f663a6 100644 --- a/sd/source/ui/tools/ConfigurationAccess.cxx +++ b/sd/source/ui/tools/ConfigurationAccess.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "tools/ConfigurationAccess.hxx" #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -43,9 +42,6 @@ ConfigurationAccess::ConfigurationAccess ( Initialize(xProvider, rsRootName, eMode); } - - - ConfigurationAccess::ConfigurationAccess ( const OUString& rsRootName, const WriteMode eMode) @@ -56,9 +52,6 @@ ConfigurationAccess::ConfigurationAccess ( Initialize(xProvider, rsRootName, eMode); } - - - void ConfigurationAccess::Initialize ( const Reference<lang::XMultiServiceFactory>& rxProvider, const OUString& rsRootName, @@ -98,9 +91,6 @@ void ConfigurationAccess::Initialize ( } } - - - Any ConfigurationAccess::GetConfigurationNode ( const OUString& sPathToNode) { @@ -109,9 +99,6 @@ Any ConfigurationAccess::GetConfigurationNode ( sPathToNode); } - - - Any ConfigurationAccess::GetConfigurationNode ( const css::uno::Reference<css::container::XHierarchicalNameAccess>& rxNode, const OUString& sPathToNode) @@ -136,9 +123,6 @@ Any ConfigurationAccess::GetConfigurationNode ( return Any(); } - - - void ConfigurationAccess::CommitChanges (void) { Reference<util::XChangesBatch> xConfiguration (mxRoot, UNO_QUERY); @@ -146,9 +130,6 @@ void ConfigurationAccess::CommitChanges (void) xConfiguration->commitChanges(); } - - - void ConfigurationAccess::ForAll ( const Reference<container::XNameAccess>& rxContainer, const ::std::vector<OUString>& rArguments, @@ -174,9 +155,6 @@ void ConfigurationAccess::ForAll ( } } - - - void ConfigurationAccess::FillList( const Reference<container::XNameAccess>& rxContainer, const OUString& rsArgument, @@ -203,7 +181,6 @@ void ConfigurationAccess::FillList( {} } - } } // end of namespace sd::tools /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx index ed47917e714d..f3fe19d74eca 100644 --- a/sd/source/ui/tools/EventMultiplexer.cxx +++ b/sd/source/ui/tools/EventMultiplexer.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "EventMultiplexer.hxx" #include "MutexOwner.hxx" @@ -85,7 +84,6 @@ public: disposing (const ::com::sun::star::lang::EventObject& rEventObject) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //===== beans::XPropertySetListener ======================================= virtual void SAL_CALL propertyChange ( @@ -113,7 +111,6 @@ public: const ::com::sun::star::drawing::framework::ConfigurationChangeEvent& rEvent) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; protected: @@ -161,11 +158,9 @@ private: DECL_LINK(SlideSorterSelectionChangeListener, void*); }; - const char aCurrentPagePropertyName[] = "CurrentPage"; const char aEditModePropertyName[] = "IsMasterPageMode"; - //===== EventMultiplexer ====================================================== EventMultiplexer::EventMultiplexer (ViewShellBase& rBase) @@ -174,9 +169,6 @@ EventMultiplexer::EventMultiplexer (ViewShellBase& rBase) mpImpl->acquire(); } - - - EventMultiplexer::~EventMultiplexer (void) { try @@ -197,9 +189,6 @@ EventMultiplexer::~EventMultiplexer (void) } } - - - void EventMultiplexer::AddEventListener ( Link& rCallback, EventMultiplexerEvent::EventId aEventTypes) @@ -207,9 +196,6 @@ void EventMultiplexer::AddEventListener ( mpImpl->AddEventListener (rCallback, aEventTypes); } - - - void EventMultiplexer::RemoveEventListener ( Link& rCallback, EventMultiplexerEvent::EventId aEventTypes) @@ -217,9 +203,6 @@ void EventMultiplexer::RemoveEventListener ( mpImpl->RemoveEventListener (rCallback, aEventTypes); } - - - void EventMultiplexer::MultiplexEvent( EventMultiplexerEvent::EventId eEventId, void* pUserData ) @@ -228,9 +211,6 @@ void EventMultiplexer::MultiplexEvent( mpImpl->CallListeners(aEvent); } - - - //===== EventMultiplexer::Implementation ====================================== EventMultiplexer::Implementation::Implementation (ViewShellBase& rBase) @@ -298,18 +278,12 @@ EventMultiplexer::Implementation::Implementation (ViewShellBase& rBase) } } - - - EventMultiplexer::Implementation::~Implementation (void) { DBG_ASSERT( !mbListeningToFrame, "sd::EventMultiplexer::Implementation::~Implementation(), disposing was not called!" ); } - - - void EventMultiplexer::Implementation::ReleaseListeners (void) { if (mbListeningToFrame) @@ -346,9 +320,6 @@ void EventMultiplexer::Implementation::ReleaseListeners (void) } } - - - void EventMultiplexer::Implementation::AddEventListener ( Link& rCallback, EventMultiplexerEvent::EventId aEventTypes) @@ -369,9 +340,6 @@ void EventMultiplexer::Implementation::AddEventListener ( } } - - - void EventMultiplexer::Implementation::RemoveEventListener ( Link& rCallback, EventMultiplexerEvent::EventId aEventTypes) @@ -391,9 +359,6 @@ void EventMultiplexer::Implementation::RemoveEventListener ( } } - - - void EventMultiplexer::Implementation::ConnectToController (void) { // Just in case that we missed some event we now disconnect from the old @@ -456,9 +421,6 @@ void EventMultiplexer::Implementation::ConnectToController (void) } } - - - void EventMultiplexer::Implementation::DisconnectFromController (void) { if (mbListeningToController) @@ -507,9 +469,6 @@ void EventMultiplexer::Implementation::DisconnectFromController (void) } } - - - //===== lang::XEventListener ================================================ void SAL_CALL EventMultiplexer::Implementation::disposing ( @@ -534,9 +493,6 @@ void SAL_CALL EventMultiplexer::Implementation::disposing ( } } - - - //===== beans::XPropertySetListener ========================================= void SAL_CALL EventMultiplexer::Implementation::propertyChange ( @@ -560,9 +516,6 @@ void SAL_CALL EventMultiplexer::Implementation::propertyChange ( } } - - - //===== frame::XFrameActionListener ========================================== void SAL_CALL EventMultiplexer::Implementation::frameAction ( @@ -595,9 +548,6 @@ void SAL_CALL EventMultiplexer::Implementation::frameAction ( } } - - - //===== view::XSelectionChangeListener ======================================== void SAL_CALL EventMultiplexer::Implementation::selectionChanged ( @@ -607,9 +557,6 @@ void SAL_CALL EventMultiplexer::Implementation::selectionChanged ( CallListeners (EventMultiplexerEvent::EID_EDIT_VIEW_SELECTION); } - - - //===== drawing::framework::XConfigurationChangeListener ================== void SAL_CALL EventMultiplexer::Implementation::notifyConfigurationChange ( @@ -682,18 +629,12 @@ void SAL_CALL EventMultiplexer::Implementation::notifyConfigurationChange ( } - - - void SAL_CALL EventMultiplexer::Implementation::disposing (void) { CallListeners (EventMultiplexerEvent::EID_DISPOSING); ReleaseListeners(); } - - - void EventMultiplexer::Implementation::ThrowIfDisposed (void) throw (::com::sun::star::lang::DisposedException) { @@ -705,9 +646,6 @@ void EventMultiplexer::Implementation::ThrowIfDisposed (void) } } - - - void EventMultiplexer::Implementation::Notify ( SfxBroadcaster&, const SfxHint& rHint) @@ -752,9 +690,6 @@ void EventMultiplexer::Implementation::Notify ( } } - - - void EventMultiplexer::Implementation::CallListeners ( EventMultiplexerEvent::EventId eId, void* pUserData) @@ -763,9 +698,6 @@ void EventMultiplexer::Implementation::CallListeners ( CallListeners(aEvent); } - - - void EventMultiplexer::Implementation::CallListeners (EventMultiplexerEvent& rEvent) { ListenerList aCopyListeners( maListeners ); @@ -778,18 +710,12 @@ void EventMultiplexer::Implementation::CallListeners (EventMultiplexerEvent& rEv } } - - - IMPL_LINK_NOARG(EventMultiplexer::Implementation, SlideSorterSelectionChangeListener) { CallListeners (EventMultiplexerEvent::EID_SLIDE_SORTER_SELECTION); return 0; } - - - //===== EventMultiplexerEvent ================================================= EventMultiplexerEvent::EventMultiplexerEvent ( diff --git a/sd/source/ui/tools/IconCache.cxx b/sd/source/ui/tools/IconCache.cxx index 8a015d767c43..1de1924bfb8b 100644 --- a/sd/source/ui/tools/IconCache.cxx +++ b/sd/source/ui/tools/IconCache.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "tools/IconCache.hxx" #include "sdresid.hxx" @@ -48,8 +47,6 @@ private: IconCache* IconCache::Implementation::mpInstance = NULL; - - Image IconCache::Implementation::GetIcon (sal_uInt16 nResourceId) { Image aResult; @@ -65,9 +62,6 @@ Image IconCache::Implementation::GetIcon (sal_uInt16 nResourceId) return aResult; } - - - //===== IconCache ============================================================= //static @@ -96,25 +90,16 @@ IconCache& IconCache::Instance (void) return *Implementation::mpInstance; } - - - Image IconCache::GetIcon (sal_uInt16 nResourceId) { return mpImpl->GetIcon (nResourceId); } - - - IconCache::IconCache (void) : mpImpl (new Implementation()) { } - - - IconCache::~IconCache (void) { // empty diff --git a/sd/source/ui/tools/IdleDetection.cxx b/sd/source/ui/tools/IdleDetection.cxx index 5fce6fe9d9a2..e7bafc546bc3 100644 --- a/sd/source/ui/tools/IdleDetection.cxx +++ b/sd/source/ui/tools/IdleDetection.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "tools/IdleDetection.hxx" #include "ViewShell.hxx" @@ -34,7 +33,6 @@ using namespace ::com::sun::star; namespace sd { namespace tools { - sal_Int32 IdleDetection::GetIdleState (const ::Window* pWindow) { sal_Int32 nResult (CheckInputPending() | CheckSlideShowRunning()); @@ -43,9 +41,6 @@ sal_Int32 IdleDetection::GetIdleState (const ::Window* pWindow) return nResult; } - - - sal_Int32 IdleDetection::CheckInputPending (void) { if (Application::AnyInput(VCL_INPUT_MOUSE | VCL_INPUT_KEYBOARD | VCL_INPUT_PAINT)) @@ -54,9 +49,6 @@ sal_Int32 IdleDetection::CheckInputPending (void) return IDET_IDLE; } - - - sal_Int32 IdleDetection::CheckSlideShowRunning (void) { sal_Int32 eResult (IDET_IDLE); @@ -101,9 +93,6 @@ sal_Int32 IdleDetection::CheckSlideShowRunning (void) return eResult; } - - - sal_Int32 IdleDetection::CheckWindowPainting (const ::Window& rWindow) { if (rWindow.IsInPaint()) diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx index ac9e9ee17adc..1dda905404ad 100644 --- a/sd/source/ui/tools/PreviewRenderer.cxx +++ b/sd/source/ui/tools/PreviewRenderer.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "PreviewRenderer.hxx" #include "DrawDocShell.hxx" @@ -40,7 +39,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; - namespace sd { const int PreviewRenderer::snSubstitutionTextSize = 11; @@ -61,9 +59,6 @@ namespace { }; } - - - //===== PreviewRenderer ======================================================= PreviewRenderer::PreviewRenderer ( @@ -87,18 +82,12 @@ PreviewRenderer::PreviewRenderer ( } } - - - PreviewRenderer::~PreviewRenderer (void) { if (mpDocShellOfView != NULL) EndListening (*mpDocShellOfView); } - - - Image PreviewRenderer::RenderPage ( const SdPage* pPage, const sal_Int32 nWidth, @@ -125,9 +114,6 @@ Image PreviewRenderer::RenderPage ( return Image(); } - - - Image PreviewRenderer::RenderPage ( const SdPage* pPage, Size aPixelSize, @@ -164,9 +150,6 @@ Image PreviewRenderer::RenderPage ( return aPreview; } - - - Image PreviewRenderer::RenderSubstitution ( const Size& rPreviewPixelSize, const OUString& rSubstitutionText) @@ -225,9 +208,6 @@ Image PreviewRenderer::RenderSubstitution ( return aPreview; } - - - bool PreviewRenderer::Initialize ( const SdPage* pPage, const Size& rPixelSize, @@ -303,17 +283,11 @@ bool PreviewRenderer::Initialize ( return true; } - - - void PreviewRenderer::Cleanup (void) { mpView->HideSdrPage(); } - - - void PreviewRenderer::PaintPage ( const SdPage* pPage, const bool bDisplayPresentationObjects) @@ -351,9 +325,6 @@ void PreviewRenderer::PaintPage ( pOutliner->SetControlWord(nSavedControlWord); } - - - void PreviewRenderer::PaintSubstitutionText (const OUString& rSubstitutionText) { if (!rSubstitutionText.isEmpty()) @@ -382,9 +353,6 @@ void PreviewRenderer::PaintSubstitutionText (const OUString& rSubstitutionText) } } - - - void PreviewRenderer::PaintFrame (void) { if (mbHasFrame) @@ -401,9 +369,6 @@ void PreviewRenderer::PaintFrame (void) } } - - - void PreviewRenderer::SetupOutputSize ( const SdPage& rPage, const Size& rFramePixelSize) @@ -435,9 +400,6 @@ void PreviewRenderer::SetupOutputSize ( mpPreviewDevice->SetOutputSizePixel(rFramePixelSize); } - - - void PreviewRenderer::ProvideView (DrawDocShell* pDocShell) { if (pDocShell != mpDocShellOfView) @@ -474,9 +436,6 @@ void PreviewRenderer::ProvideView (DrawDocShell* pDocShell) #endif } - - - Image PreviewRenderer::ScaleBitmap ( const BitmapEx& rBitmapEx, int nWidth) @@ -529,9 +488,6 @@ Image PreviewRenderer::ScaleBitmap ( return aPreview; } - - - void PreviewRenderer::Notify(SfxBroadcaster&, const SfxHint& rHint) { if (rHint.IsA(TYPE(SfxSimpleHint)) @@ -551,9 +507,6 @@ void PreviewRenderer::Notify(SfxBroadcaster&, const SfxHint& rHint) } } - - - //===== ViewRedirector ======================================================== namespace { @@ -562,16 +515,10 @@ ViewRedirector::ViewRedirector (void) { } - - - ViewRedirector::~ViewRedirector (void) { } - - - drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedPrimitive2DSequence( const sdr::contact::ViewObjectContact& rOriginal, const sdr::contact::DisplayInfo& rDisplayInfo) @@ -604,7 +551,6 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP } // end of anonymous namespace - } // end of namespace ::sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/tools/PropertySet.cxx b/sd/source/ui/tools/PropertySet.cxx index 6632a4be8e4d..66fecd19a58f 100644 --- a/sd/source/ui/tools/PropertySet.cxx +++ b/sd/source/ui/tools/PropertySet.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "tools/PropertySet.hxx" #include <algorithm> #include <o3tl/compat_functional.hxx> @@ -33,16 +32,10 @@ PropertySet::PropertySet (void) { } - - - PropertySet::~PropertySet (void) { } - - - void SAL_CALL PropertySet::disposing (void) { } @@ -55,9 +48,6 @@ Reference<beans::XPropertySetInfo> SAL_CALL PropertySet::getPropertySetInfo (voi return NULL; } - - - void SAL_CALL PropertySet::setPropertyValue ( const OUString& rsPropertyName, const css::uno::Any& rsPropertyValue) @@ -86,9 +76,6 @@ void SAL_CALL PropertySet::setPropertyValue ( } } - - - Any SAL_CALL PropertySet::getPropertyValue (const OUString& rsPropertyName) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, @@ -99,9 +86,6 @@ Any SAL_CALL PropertySet::getPropertyValue (const OUString& rsPropertyName) return GetPropertyValue(rsPropertyName); } - - - void SAL_CALL PropertySet::addPropertyChangeListener ( const OUString& rsPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener) @@ -121,9 +105,6 @@ void SAL_CALL PropertySet::addPropertyChangeListener ( rxListener)); } - - - void SAL_CALL PropertySet::removePropertyChangeListener ( const OUString& rsPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener) @@ -152,9 +133,6 @@ void SAL_CALL PropertySet::removePropertyChangeListener ( } } - - - void SAL_CALL PropertySet::addVetoableChangeListener ( const OUString& rsPropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener) @@ -168,9 +146,6 @@ void SAL_CALL PropertySet::addVetoableChangeListener ( (void)rxListener; } - - - void SAL_CALL PropertySet::removeVetoableChangeListener ( const OUString& rsPropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener) @@ -184,11 +159,6 @@ void SAL_CALL PropertySet::removeVetoableChangeListener ( (void)rxListener; } - - - - - void PropertySet::CallListeners ( const OUString& rsPropertyName, const beans::PropertyChangeEvent& rEvent) @@ -203,9 +173,6 @@ void PropertySet::CallListeners ( } } - - - void PropertySet::ThrowIfDisposed (void) throw (::com::sun::star::lang::DisposedException) { diff --git a/sd/source/ui/tools/SdGlobalResourceContainer.cxx b/sd/source/ui/tools/SdGlobalResourceContainer.cxx index 655638ad1741..c2542c924f6f 100644 --- a/sd/source/ui/tools/SdGlobalResourceContainer.cxx +++ b/sd/source/ui/tools/SdGlobalResourceContainer.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "tools/SdGlobalResourceContainer.hxx" #include <algorithm> @@ -26,10 +25,8 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; - namespace sd { - //===== SdGlobalResourceContainer::Implementation ============================= class SdGlobalResourceContainer::Implementation @@ -53,9 +50,6 @@ private: XInterfaceResourceList maXInterfaceResources; }; - - - // static SdGlobalResourceContainer& SdGlobalResourceContainer::Instance (void) { @@ -68,9 +62,6 @@ SdGlobalResourceContainer& SdGlobalResourceContainer::Instance (void) SdGlobalResourceContainer* SdGlobalResourceContainer::Implementation::mpInstance = NULL; - - - //===== SdGlobalResourceContainer ============================================= void SdGlobalResourceContainer::AddResource ( @@ -97,9 +88,6 @@ void SdGlobalResourceContainer::AddResource ( pResource.release(); } - - - void SdGlobalResourceContainer::AddResource ( ::boost::shared_ptr<SdGlobalResource> pResource) { @@ -119,9 +107,6 @@ void SdGlobalResourceContainer::AddResource ( } } - - - void SdGlobalResourceContainer::AddResource (const Reference<XInterface>& rxResource) { ::osl::MutexGuard aGuard (mpImpl->maMutex); @@ -140,17 +125,12 @@ void SdGlobalResourceContainer::AddResource (const Reference<XInterface>& rxReso } } - - SdGlobalResourceContainer::SdGlobalResourceContainer (void) : mpImpl (new SdGlobalResourceContainer::Implementation()) { Implementation::mpInstance = this; } - - - SdGlobalResourceContainer::~SdGlobalResourceContainer (void) { ::osl::MutexGuard aGuard (mpImpl->maMutex); @@ -199,9 +179,6 @@ SdGlobalResourceContainer::~SdGlobalResourceContainer (void) Implementation::mpInstance = NULL; } - - - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/tools/SlotStateListener.cxx b/sd/source/ui/tools/SlotStateListener.cxx index 09f7c454f3b1..345628c593dd 100644 --- a/sd/source/ui/tools/SlotStateListener.cxx +++ b/sd/source/ui/tools/SlotStateListener.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "tools/SlotStateListener.hxx" #include <com/sun/star/frame/XStatusListener.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> @@ -33,7 +32,6 @@ using namespace ::rtl; namespace sd { namespace tools { - SlotStateListener::SlotStateListener ( Link& rCallback, const uno::Reference<frame::XDispatchProvider>& rxDispatchProvider, @@ -47,17 +45,11 @@ SlotStateListener::SlotStateListener ( ObserveSlot(rSlotName); } - - - SlotStateListener::~SlotStateListener (void) { ReleaseListeners(); } - - - void SlotStateListener::SetCallback (const Link& rCallback) { ThrowIfDisposed(); @@ -65,9 +57,6 @@ void SlotStateListener::SetCallback (const Link& rCallback) maCallback = rCallback; } - - - void SlotStateListener::ConnectToDispatchProvider ( const uno::Reference<frame::XDispatchProvider>& rxDispatchProvider) { @@ -81,9 +70,6 @@ void SlotStateListener::ConnectToDispatchProvider ( mxDispatchProviderWeak = rxDispatchProvider; } - - - void SlotStateListener::ObserveSlot (const OUString& rSlotName) { ThrowIfDisposed(); @@ -101,9 +87,6 @@ void SlotStateListener::ObserveSlot (const OUString& rSlotName) } } - - - void SlotStateListener::disposing (void) { ReleaseListeners(); @@ -111,9 +94,6 @@ void SlotStateListener::disposing (void) maCallback = Link(); } - - - util::URL SlotStateListener::MakeURL (const OUString& rSlotName) const { util::URL aURL; @@ -125,9 +105,6 @@ util::URL SlotStateListener::MakeURL (const OUString& rSlotName) const return aURL; } - - - uno::Reference<frame::XDispatch> SlotStateListener::GetDispatch (const util::URL& rURL) const { @@ -140,9 +117,6 @@ uno::Reference<frame::XDispatch> return xDispatch; } - - - void SlotStateListener::statusChanged ( const frame::FeatureStateEvent& rState) throw (uno::RuntimeException, std::exception) @@ -153,9 +127,6 @@ void SlotStateListener::statusChanged ( maCallback.Call(&sSlotName); } - - - void SlotStateListener::ReleaseListeners (void) { if ( ! maRegisteredURLList.empty()) @@ -173,9 +144,6 @@ void SlotStateListener::ReleaseListeners (void) } } - - - //===== lang::XEventListener ================================================ void SAL_CALL SlotStateListener::disposing ( @@ -184,9 +152,6 @@ void SAL_CALL SlotStateListener::disposing ( { } - - - void SlotStateListener::ThrowIfDisposed (void) throw (lang::DisposedException) { @@ -197,9 +162,6 @@ void SlotStateListener::ThrowIfDisposed (void) } } - - - } } // end of namespace ::sd::tools /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/tools/TimerBasedTaskExecution.cxx b/sd/source/ui/tools/TimerBasedTaskExecution.cxx index a80680e79f0b..085cb8e2ecc9 100644 --- a/sd/source/ui/tools/TimerBasedTaskExecution.cxx +++ b/sd/source/ui/tools/TimerBasedTaskExecution.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "tools/TimerBasedTaskExecution.hxx" #include "tools/AsynchronousTask.hxx" #include <tools/time.hxx> @@ -38,9 +37,6 @@ public: } }; - - - ::boost::shared_ptr<TimerBasedTaskExecution> TimerBasedTaskExecution::Create ( const ::boost::shared_ptr<AsynchronousTask>& rpTask, sal_uInt32 nMillisecondsBetweenSteps, @@ -56,18 +52,12 @@ public: return pExecution; } - - - void TimerBasedTaskExecution::Release (void) { maTimer.Stop(); mpSelf.reset(); } - - - //static void TimerBasedTaskExecution::ReleaseTask ( const ::boost::weak_ptr<TimerBasedTaskExecution>& rpExecution) @@ -89,9 +79,6 @@ void TimerBasedTaskExecution::ReleaseTask ( } } - - - TimerBasedTaskExecution::TimerBasedTaskExecution ( const ::boost::shared_ptr<AsynchronousTask>& rpTask, sal_uInt32 nMillisecondsBetweenSteps, @@ -107,17 +94,11 @@ TimerBasedTaskExecution::TimerBasedTaskExecution ( maTimer.Start(); } - - - TimerBasedTaskExecution::~TimerBasedTaskExecution (void) { maTimer.Stop(); } - - - void TimerBasedTaskExecution::SetSelf ( const ::boost::shared_ptr<TimerBasedTaskExecution>& rpSelf) { @@ -125,9 +106,6 @@ void TimerBasedTaskExecution::SetSelf ( mpSelf = rpSelf; } - - - IMPL_LINK_NOARG(TimerBasedTaskExecution, TimerCallback) { if (mpTask.get() != NULL) @@ -158,7 +136,6 @@ IMPL_LINK_NOARG(TimerBasedTaskExecution, TimerCallback) return 0; } - } } // end of namespace ::sd::tools /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index 75ae4e6128c7..02e9e9dc5fc8 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "DrawController.hxx" #include "DrawDocShell.hxx" @@ -83,16 +82,10 @@ DrawController::DrawController (ViewShellBase& rBase) throw() ProvideFrameworkControllers(); } - - - DrawController::~DrawController (void) throw() { } - - - void DrawController::SetSubController ( const Reference<drawing::XDrawSubController>& rxSubController) { @@ -105,9 +98,6 @@ void DrawController::SetSubController ( FireSelectionChangeListener(); } - - - // XInterface IMPLEMENT_FORWARD_XINTERFACE2( @@ -115,7 +105,6 @@ IMPLEMENT_FORWARD_XINTERFACE2( DrawControllerInterfaceBase, OPropertySetHelper); - // XTypeProvider Sequence<Type> SAL_CALL DrawController::getTypes (void) @@ -137,11 +126,8 @@ Sequence<Type> SAL_CALL DrawController::getTypes (void) IMPLEMENT_GET_IMPLEMENTATION_ID(DrawController); - - // XComponent - void SAL_CALL DrawController::dispose (void) throw( RuntimeException, std::exception ) { @@ -183,9 +169,6 @@ void SAL_CALL DrawController::dispose (void) } } - - - void SAL_CALL DrawController::addEventListener( const Reference<lang::XEventListener >& xListener) throw (RuntimeException, std::exception) @@ -194,9 +177,6 @@ void SAL_CALL DrawController::addEventListener( SfxBaseController::addEventListener( xListener ); } - - - void SAL_CALL DrawController::removeEventListener ( const Reference<lang::XEventListener >& aListener) throw (RuntimeException, std::exception) @@ -263,9 +243,6 @@ sal_Bool SAL_CALL DrawController::select (const Any& aSelection) return false; } - - - Any SAL_CALL DrawController::getSelection() throw(RuntimeException, std::exception) { @@ -278,9 +255,6 @@ Any SAL_CALL DrawController::getSelection() return Any(); } - - - void SAL_CALL DrawController::addSelectionChangeListener( const Reference< view::XSelectionChangeListener >& xListener) throw(RuntimeException, std::exception) @@ -291,9 +265,6 @@ void SAL_CALL DrawController::addSelectionChangeListener( BroadcastHelperOwner::maBroadcastHelper.addListener (m_aSelectionTypeIdentifier, xListener); } - - - void SAL_CALL DrawController::removeSelectionChangeListener( const Reference< view::XSelectionChangeListener >& xListener ) throw(RuntimeException, std::exception) @@ -304,10 +275,6 @@ void SAL_CALL DrawController::removeSelectionChangeListener( BroadcastHelperOwner::maBroadcastHelper.removeListener (m_aSelectionTypeIdentifier, xListener); } - - - - //===== lang::XEventListener ================================================ void SAL_CALL @@ -316,9 +283,6 @@ void SAL_CALL { } - - - //===== view::XSelectionChangeListener ====================================== void SAL_CALL @@ -350,9 +314,6 @@ void SAL_CALL } } - - - // XDrawView void SAL_CALL DrawController::setCurrentPage( const Reference< drawing::XDrawPage >& xPage ) @@ -365,9 +326,6 @@ void SAL_CALL DrawController::setCurrentPage( const Reference< drawing::XDrawPag mxSubController->setCurrentPage(xPage); } - - - Reference< drawing::XDrawPage > SAL_CALL DrawController::getCurrentPage (void) throw(RuntimeException, std::exception) { @@ -387,9 +345,6 @@ Reference< drawing::XDrawPage > SAL_CALL DrawController::getCurrentPage (void) return xPage; } - - - void DrawController::FireVisAreaChanged (const Rectangle& rVisArea) throw() { if( maLastVisArea != rVisArea ) @@ -414,9 +369,6 @@ void DrawController::FireVisAreaChanged (const Rectangle& rVisArea) throw() } } - - - void DrawController::FireSelectionChangeListener() throw() { OInterfaceContainerHelper * pLC = BroadcastHelperOwner::maBroadcastHelper.getContainer( @@ -444,9 +396,6 @@ void DrawController::FireSelectionChangeListener() throw() } } - - - void DrawController::FireChangeEditMode (bool bMasterPageMode) throw() { if (bMasterPageMode != mbMasterPageMode ) @@ -460,9 +409,6 @@ void DrawController::FireChangeEditMode (bool bMasterPageMode) throw() } } - - - void DrawController::FireChangeLayerMode (bool bLayerMode) throw() { if (bLayerMode != mbLayerMode) @@ -476,9 +422,6 @@ void DrawController::FireChangeLayerMode (bool bLayerMode) throw() } } - - - void DrawController::FireSwitchCurrentPage (SdPage* pNewCurrentPage) throw() { SdrPage* pCurrentPage = mpCurrentPage.get(); @@ -568,9 +511,6 @@ void DrawController::FirePropertyChange ( } - - - void DrawController::BroadcastContextChange (void) const { ::boost::shared_ptr<ViewShell> pViewShell (mpBase->GetMainViewShell()); @@ -614,22 +554,12 @@ void DrawController::BroadcastContextChange (void) const ContextChangeEventMultiplexer::NotifyContextChange(mpBase, eContext); } - - - - - - - void DrawController::ReleaseViewShellBase (void) { DisposeFrameworkControllers(); mpBase = NULL; } - - - //===== XControllerManager ============================================================== Reference<XConfigurationController> SAL_CALL @@ -641,9 +571,6 @@ Reference<XConfigurationController> SAL_CALL return mxConfigurationController; } - - - Reference<XModuleController> SAL_CALL DrawController::getModuleController (void) throw (RuntimeException, std::exception) @@ -653,9 +580,6 @@ Reference<XModuleController> SAL_CALL return mxModuleController; } - - - //===== XUnoTunnel ============================================================ namespace @@ -668,9 +592,6 @@ const Sequence<sal_Int8>& DrawController::getUnoTunnelId (void) return theDrawControllerUnoTunnelId::get().getSeq(); } - - - sal_Int64 SAL_CALL DrawController::getSomething (const Sequence<sal_Int8>& rId) throw (RuntimeException, std::exception) { @@ -685,9 +606,6 @@ sal_Int64 SAL_CALL DrawController::getSomething (const Sequence<sal_Int8>& rId) return nResult; } - - - //===== Properties ============================================================ void DrawController::FillPropertyTable ( @@ -758,9 +676,6 @@ void DrawController::FillPropertyTable ( beans::PropertyAttribute::BOUND )); } - - - IPropertyArrayHelper & DrawController::getInfoHelper() { SolarMutexGuard aGuard; @@ -778,9 +693,6 @@ IPropertyArrayHelper & DrawController::getInfoHelper() return *mpPropertyArrayHelper.get(); } - - - Reference < beans::XPropertySetInfo > DrawController::getPropertySetInfo() throw ( ::com::sun::star::uno::RuntimeException, std::exception) { @@ -790,7 +702,6 @@ Reference < beans::XPropertySetInfo > DrawController::getPropertySetInfo() return xInfo; } - uno::Reference< form::runtime::XFormController > SAL_CALL DrawController::getFormController( const uno::Reference< form::XForm >& Form ) throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -843,9 +754,6 @@ uno::Reference< awt::XControl > SAL_CALL DrawController::getControl( const uno:: return xControl; } - - - sal_Bool DrawController::convertFastPropertyValue ( Any & rConvertedValue, Any & rOldValue, @@ -879,9 +787,6 @@ sal_Bool DrawController::convertFastPropertyValue ( return bResult; } - - - void DrawController::setFastPropertyValue_NoBroadcast ( sal_Int32 nHandle, const Any& rValue) @@ -894,9 +799,6 @@ void DrawController::setFastPropertyValue_NoBroadcast ( mxSubController->setFastPropertyValue(nHandle, rValue); } - - - void DrawController::getFastPropertyValue ( Any & rRet, sal_Int32 nHandle ) const @@ -924,11 +826,6 @@ void DrawController::getFastPropertyValue ( } } - - - - - void DrawController::ProvideFrameworkControllers (void) { SolarMutexGuard aGuard; @@ -951,9 +848,6 @@ void DrawController::ProvideFrameworkControllers (void) } } - - - void DrawController::DisposeFrameworkControllers (void) { Reference<XComponent> xComponent (mxModuleController, UNO_QUERY); @@ -965,9 +859,6 @@ void DrawController::DisposeFrameworkControllers (void) xComponent->dispose(); } - - - void DrawController::ThrowIfDisposed (void) const throw (::com::sun::star::lang::DisposedException) { @@ -980,11 +871,6 @@ void DrawController::ThrowIfDisposed (void) const } } - - - - } // end of namespace sd - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx index 436736595fe2..6ae27149da96 100644 --- a/sd/source/ui/unoidl/SdUnoDrawView.cxx +++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "SdUnoDrawView.hxx" #include "DrawController.hxx" @@ -45,12 +44,10 @@ #include <vector> - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing; - namespace sd { SdUnoDrawView::SdUnoDrawView( @@ -62,24 +59,15 @@ SdUnoDrawView::SdUnoDrawView( { } - - - SdUnoDrawView::~SdUnoDrawView() throw() { } - - - bool SdUnoDrawView::getMasterPageMode(void) const throw() { return (mrDrawViewShell.GetEditMode() == EM_MASTERPAGE); } - - - void SdUnoDrawView::setMasterPageMode (bool bMasterPageMode) throw() { if ((mrDrawViewShell.GetEditMode() == EM_MASTERPAGE) != bMasterPageMode) @@ -90,17 +78,11 @@ void SdUnoDrawView::setMasterPageMode (bool bMasterPageMode) throw() } } - - - bool SdUnoDrawView::getLayerMode(void) const throw() { return mrDrawViewShell.IsLayerModeActive(); } - - - void SdUnoDrawView::setLayerMode (bool bLayerMode) throw() { if (mrDrawViewShell.IsLayerModeActive() != bLayerMode) @@ -111,9 +93,6 @@ void SdUnoDrawView::setLayerMode (bool bLayerMode) throw() } } - - - Reference<drawing::XLayer> SdUnoDrawView::getActiveLayer (void) throw () { Reference<drawing::XLayer> xCurrentLayer; @@ -147,9 +126,6 @@ Reference<drawing::XLayer> SdUnoDrawView::getActiveLayer (void) throw () return xCurrentLayer; } - - - void SdUnoDrawView::setActiveLayer (const Reference<drawing::XLayer>& rxLayer) throw (uno::RuntimeException) { @@ -170,12 +146,8 @@ void SdUnoDrawView::setActiveLayer (const Reference<drawing::XLayer>& rxLayer) mrDrawViewShell.ResetActualLayer (); } - - - // XSelectionSupplier - sal_Bool SAL_CALL SdUnoDrawView::select( const Any& aSelection ) throw (lang::IllegalArgumentException, RuntimeException, @@ -274,8 +246,6 @@ sal_Bool SAL_CALL SdUnoDrawView::select( const Any& aSelection ) return bOk; } - - Any SAL_CALL SdUnoDrawView::getSelection() throw (RuntimeException, std::exception) { @@ -284,7 +254,6 @@ Any SAL_CALL SdUnoDrawView::getSelection() if( mrView.IsTextEdit() ) mrView.getTextSelection( aAny ); - if( !aAny.hasValue() ) { const SdrMarkList& rMarkList = mrView.GetMarkedObjectList(); @@ -325,9 +294,6 @@ Any SAL_CALL SdUnoDrawView::getSelection() return aAny; } - - - void SAL_CALL SdUnoDrawView::addSelectionChangeListener ( const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) throw(css::uno::RuntimeException, std::exception) @@ -335,9 +301,6 @@ void SAL_CALL SdUnoDrawView::addSelectionChangeListener ( (void)rxListener; } - - - void SAL_CALL SdUnoDrawView::removeSelectionChangeListener ( const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) throw(css::uno::RuntimeException, std::exception) @@ -345,9 +308,6 @@ void SAL_CALL SdUnoDrawView::removeSelectionChangeListener ( (void)rxListener; } - - - void SdUnoDrawView::setFastPropertyValue ( sal_Int32 nHandle, const Any& rValue) @@ -415,9 +375,6 @@ void SdUnoDrawView::setFastPropertyValue ( } } - - - Any SAL_CALL SdUnoDrawView::getFastPropertyValue ( sal_Int32 nHandle) throw(css::beans::UnknownPropertyException, @@ -464,12 +421,8 @@ Any SAL_CALL SdUnoDrawView::getFastPropertyValue ( return aValue; } - - - // XDrawView - void SAL_CALL SdUnoDrawView::setCurrentPage ( const Reference< drawing::XDrawPage >& xPage ) throw (RuntimeException, std::exception) @@ -489,8 +442,6 @@ void SAL_CALL SdUnoDrawView::setCurrentPage ( } } - - Reference< drawing::XDrawPage > SAL_CALL SdUnoDrawView::getCurrentPage() throw(RuntimeException, std::exception) { @@ -505,7 +456,6 @@ Reference< drawing::XDrawPage > SAL_CALL SdUnoDrawView::getCurrentPage() return xPage; } - sal_Int16 SdUnoDrawView::GetZoom(void) const { if (mrDrawViewShell.GetActiveWindow() ) @@ -533,7 +483,6 @@ void SdUnoDrawView::SetZoom( sal_Int16 nZoom ) } } - void SdUnoDrawView::SetViewOffset(const awt::Point& rWinPos ) { Point aWinPos( rWinPos.X, rWinPos.Y ); @@ -584,9 +533,6 @@ void SdUnoDrawView::SetZoomType ( sal_Int16 nType ) } } - - - SdXImpressDocument* SdUnoDrawView::GetModel (void) const throw() { if (mrView.GetDocSh()!=NULL) diff --git a/sd/source/ui/unoidl/SdUnoOutlineView.cxx b/sd/source/ui/unoidl/SdUnoOutlineView.cxx index 1d0e947218b4..8cd73a9a1a92 100644 --- a/sd/source/ui/unoidl/SdUnoOutlineView.cxx +++ b/sd/source/ui/unoidl/SdUnoOutlineView.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "SdUnoOutlineView.hxx" #include "DrawController.hxx" @@ -35,8 +34,6 @@ using namespace ::cppu; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; - - namespace sd { SdUnoOutlineView::SdUnoOutlineView( @@ -46,23 +43,14 @@ SdUnoOutlineView::SdUnoOutlineView( { } - - - SdUnoOutlineView::~SdUnoOutlineView (void) throw() { } - - - void SAL_CALL SdUnoOutlineView::disposing (void) { } - - - //----- XSelectionSupplier ---------------------------------------------------- sal_Bool SAL_CALL SdUnoOutlineView::select( const Any& ) @@ -72,8 +60,6 @@ sal_Bool SAL_CALL SdUnoOutlineView::select( const Any& ) return sal_False; } - - Any SAL_CALL SdUnoOutlineView::getSelection() throw(RuntimeException, std::exception) { @@ -81,8 +67,6 @@ Any SAL_CALL SdUnoOutlineView::getSelection() return aAny; } - - void SAL_CALL SdUnoOutlineView::addSelectionChangeListener ( const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) throw(css::uno::RuntimeException, std::exception) @@ -90,9 +74,6 @@ void SAL_CALL SdUnoOutlineView::addSelectionChangeListener ( (void)rxListener; } - - - void SAL_CALL SdUnoOutlineView::removeSelectionChangeListener ( const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) throw(css::uno::RuntimeException, std::exception) @@ -149,17 +130,11 @@ void SdUnoOutlineView::setFastPropertyValue ( } } - - - void SAL_CALL SdUnoOutlineView::disposing (const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException) { } - - - Any SAL_CALL SdUnoOutlineView::getFastPropertyValue ( sal_Int32 nHandle) throw(css::beans::UnknownPropertyException, diff --git a/sd/source/ui/unoidl/SdUnoSlideView.cxx b/sd/source/ui/unoidl/SdUnoSlideView.cxx index 2bf6b4418e90..dc11cc2ad6a5 100644 --- a/sd/source/ui/unoidl/SdUnoSlideView.cxx +++ b/sd/source/ui/unoidl/SdUnoSlideView.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <cppuhelper/supportsservice.hxx> #include "DrawController.hxx" @@ -33,13 +32,11 @@ #include "sdpage.hxx" #include <com/sun/star/beans/XPropertySet.hpp> - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; namespace sd { - SdUnoSlideView::SdUnoSlideView ( slidesorter::SlideSorter& rSlideSorter) throw() : DrawSubControllerInterfaceBase(m_aMutex), @@ -47,16 +44,10 @@ SdUnoSlideView::SdUnoSlideView ( { } - - - SdUnoSlideView::~SdUnoSlideView (void) throw() { } - - - //----- XSelectionSupplier ---------------------------------------------------- sal_Bool SAL_CALL SdUnoSlideView::select (const Any& aSelection) @@ -93,9 +84,6 @@ sal_Bool SAL_CALL SdUnoSlideView::select (const Any& aSelection) return bOk; } - - - Any SAL_CALL SdUnoSlideView::getSelection (void) throw(RuntimeException, std::exception) { @@ -119,9 +107,6 @@ Any SAL_CALL SdUnoSlideView::getSelection (void) return aResult; } - - - void SAL_CALL SdUnoSlideView::addSelectionChangeListener ( const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) throw(css::uno::RuntimeException, std::exception) @@ -129,9 +114,6 @@ void SAL_CALL SdUnoSlideView::addSelectionChangeListener ( (void)rxListener; } - - - void SAL_CALL SdUnoSlideView::removeSelectionChangeListener ( const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) throw(css::uno::RuntimeException, std::exception) @@ -139,9 +121,6 @@ void SAL_CALL SdUnoSlideView::removeSelectionChangeListener ( (void)rxListener; } - - - //----- XDrawView ------------------------------------------------------------- void SAL_CALL SdUnoSlideView::setCurrentPage ( @@ -161,9 +140,6 @@ void SAL_CALL SdUnoSlideView::setCurrentPage ( } } - - - css::uno::Reference<css::drawing::XDrawPage > SAL_CALL SdUnoSlideView::getCurrentPage (void) throw(css::uno::RuntimeException, std::exception) @@ -171,9 +147,6 @@ css::uno::Reference<css::drawing::XDrawPage > SAL_CALL return mrSlideSorter.GetController().GetCurrentSlideManager()->GetCurrentSlide()->GetXDrawPage(); } - - - //----- XFastPropertySet ------------------------------------------------------ void SdUnoSlideView::setFastPropertyValue ( @@ -191,9 +164,6 @@ void SdUnoSlideView::setFastPropertyValue ( throw beans::UnknownPropertyException(); } - - - Any SAL_CALL SdUnoSlideView::getFastPropertyValue ( sal_Int32 nHandle) throw(css::beans::UnknownPropertyException, @@ -208,7 +178,6 @@ Any SAL_CALL SdUnoSlideView::getFastPropertyValue ( return Any(); } - // XServiceInfo OUString SAL_CALL SdUnoSlideView::getImplementationName( ) throw (RuntimeException, std::exception) { diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx index 9ba698d32e12..8b3851b7192e 100644 --- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx +++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vector> #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/embed/ElementModes.hpp> @@ -1184,7 +1183,6 @@ void SAL_CALL DocumentSettings::release( ) throw () WeakImplHelper3< XPropertySet, XMultiPropertySet, XServiceInfo >::release(); } - // XPropertySet Reference< XPropertySetInfo > SAL_CALL DocumentSettings::getPropertySetInfo( ) throw(RuntimeException, std::exception) { diff --git a/sd/source/ui/unoidl/detreg.cxx b/sd/source/ui/unoidl/detreg.cxx index cbaf0a283b22..791f3993bf5d 100644 --- a/sd/source/ui/unoidl/detreg.cxx +++ b/sd/source/ui/unoidl/detreg.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "sddetect.hxx" #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/registry/XRegistryKey.hpp> @@ -69,5 +68,4 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL sdd_component_getFactory( } } // extern "C" - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx index e979cf3ae61c..22cdc3dee0f2 100644 --- a/sd/source/ui/unoidl/facreg.cxx +++ b/sd/source/ui/unoidl/facreg.cxx @@ -40,10 +40,6 @@ using namespace ::sd::presenter; using namespace ::sd::slidesorter; using namespace ::sd::sidebar; - - - - // Declaration and initialization of a map from service names to locally // unique factory identifiers. @@ -75,7 +71,6 @@ enum FactoryId }; typedef ::boost::unordered_map<OUString, FactoryId, OUStringHash> FactoryMap; - namespace { static ::boost::shared_ptr<FactoryMap> spFactoryMap; ::boost::shared_ptr<FactoryMap> GetFactoryMap (void) @@ -110,7 +105,6 @@ static ::boost::shared_ptr<FactoryMap> spFactoryMap; }; } // end of anonymous namespace - extern "C" { diff --git a/sd/source/ui/unoidl/randomnode.cxx b/sd/source/ui/unoidl/randomnode.cxx index 7ed6c841312a..9c0285e9f2c3 100644 --- a/sd/source/ui/unoidl/randomnode.cxx +++ b/sd/source/ui/unoidl/randomnode.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/animations/XTimeContainer.hpp> #include <com/sun/star/presentation/ParagraphTarget.hpp> #include <com/sun/star/animations/AnimationFill.hpp> @@ -154,31 +153,23 @@ private: Reference< XAnimate > mxFirstNode; }; - - Reference< XInterface > RandomAnimationNode_createInstance( sal_Int16 nPresetClass ) { Reference< XInterface > xInt( static_cast<XWeak*>( new RandomAnimationNode( nPresetClass ) ) ); return xInt; } - - Reference< XInterface > SAL_CALL RandomNode_createInstance( const Reference< XMultiServiceFactory > & ) { Reference< XInterface > xInt( static_cast<XWeak*>( new RandomAnimationNode() ) ); return xInt; } - - OUString RandomNode__getImplementationName() throw( RuntimeException ) { return OUString( "sd::RandomAnimationNode" ) ; } - - Sequence< OUString > SAL_CALL RandomNode_getSupportedServiceNames() throw( RuntimeException ) { Sequence< OUString > aSeq( 2 ); @@ -187,8 +178,6 @@ Sequence< OUString > SAL_CALL RandomNode_getSupportedServiceNames() throw( Runti return aSeq; } - - RandomAnimationNode::RandomAnimationNode( const RandomAnimationNode& rNode ) : RandomAnimationNodeBase(), mnPresetClass( rNode.mnPresetClass ), @@ -210,8 +199,6 @@ RandomAnimationNode::RandomAnimationNode( const RandomAnimationNode& rNode ) { } - - RandomAnimationNode::RandomAnimationNode( sal_Int16 nPresetClass ) { init( nPresetClass ); @@ -234,8 +221,6 @@ void RandomAnimationNode::init( sal_Int16 nPresetClass ) mbAutoReverse = false; } - - // XInitialization void SAL_CALL RandomAnimationNode::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception) { @@ -256,8 +241,6 @@ void SAL_CALL RandomAnimationNode::initialize( const Sequence< Any >& aArguments maTarget = aArguments[0]; } - - // XAnimationNode sal_Int16 SAL_CALL RandomAnimationNode::getType() throw (RuntimeException, std::exception) { @@ -265,8 +248,6 @@ sal_Int16 SAL_CALL RandomAnimationNode::getType() throw (RuntimeException, std:: return ::com::sun::star::animations::AnimationNodeType::PAR; } - - // XAnimationNode Any SAL_CALL RandomAnimationNode::getBegin() throw (RuntimeException, std::exception) { @@ -274,8 +255,6 @@ Any SAL_CALL RandomAnimationNode::getBegin() throw (RuntimeException, std::excep return maBegin; } - - // XAnimationNode void SAL_CALL RandomAnimationNode::setBegin( const Any& _begin ) throw (RuntimeException, std::exception) { @@ -283,8 +262,6 @@ void SAL_CALL RandomAnimationNode::setBegin( const Any& _begin ) throw (RuntimeE maBegin = _begin; } - - // XAnimationNode Any SAL_CALL RandomAnimationNode::getDuration() throw (RuntimeException, std::exception) { @@ -292,8 +269,6 @@ Any SAL_CALL RandomAnimationNode::getDuration() throw (RuntimeException, std::ex return maDuration; } - - // XAnimationNode void SAL_CALL RandomAnimationNode::setDuration( const Any& _duration ) throw (RuntimeException, std::exception) { @@ -301,8 +276,6 @@ void SAL_CALL RandomAnimationNode::setDuration( const Any& _duration ) throw (Ru maDuration = _duration; } - - // XAnimationNode Any SAL_CALL RandomAnimationNode::getEnd() throw (RuntimeException, std::exception) { @@ -310,8 +283,6 @@ Any SAL_CALL RandomAnimationNode::getEnd() throw (RuntimeException, std::excepti return maEnd; } - - // XAnimationNode void SAL_CALL RandomAnimationNode::setEnd( const Any& _end ) throw (RuntimeException, std::exception) { @@ -319,8 +290,6 @@ void SAL_CALL RandomAnimationNode::setEnd( const Any& _end ) throw (RuntimeExcep maEnd = _end; } - - // XAnimationNode Any SAL_CALL RandomAnimationNode::getEndSync() throw (RuntimeException, std::exception) { @@ -328,8 +297,6 @@ Any SAL_CALL RandomAnimationNode::getEndSync() throw (RuntimeException, std::exc return maEndSync; } - - // XAnimationNode void SAL_CALL RandomAnimationNode::setEndSync( const Any& _endsync ) throw (RuntimeException, std::exception) { @@ -337,8 +304,6 @@ void SAL_CALL RandomAnimationNode::setEndSync( const Any& _endsync ) throw (Runt maEndSync = _endsync; } - - // XAnimationNode Any SAL_CALL RandomAnimationNode::getRepeatCount() throw (RuntimeException, std::exception) { @@ -346,8 +311,6 @@ Any SAL_CALL RandomAnimationNode::getRepeatCount() throw (RuntimeException, std: return maRepeatCount; } - - // XAnimationNode void SAL_CALL RandomAnimationNode::setRepeatCount( const Any& _repeatcount ) throw (RuntimeException, std::exception) { @@ -355,8 +318,6 @@ void SAL_CALL RandomAnimationNode::setRepeatCount( const Any& _repeatcount ) thr maRepeatCount = _repeatcount; } - - // XAnimationNode Any SAL_CALL RandomAnimationNode::getRepeatDuration() throw (RuntimeException, std::exception) { @@ -364,8 +325,6 @@ Any SAL_CALL RandomAnimationNode::getRepeatDuration() throw (RuntimeException, s return maRepeatDuration; } - - // XAnimationNode void SAL_CALL RandomAnimationNode::setRepeatDuration( const Any& _repeatduration ) throw (RuntimeException, std::exception) { @@ -373,8 +332,6 @@ void SAL_CALL RandomAnimationNode::setRepeatDuration( const Any& _repeatduration maRepeatDuration = _repeatduration; } - - // XAnimationNode sal_Int16 SAL_CALL RandomAnimationNode::getFill() throw (RuntimeException, std::exception) { @@ -382,8 +339,6 @@ sal_Int16 SAL_CALL RandomAnimationNode::getFill() throw (RuntimeException, std:: return mnFill; } - - // XAnimationNode void SAL_CALL RandomAnimationNode::setFill( sal_Int16 _fill ) throw (RuntimeException, std::exception) { @@ -391,8 +346,6 @@ void SAL_CALL RandomAnimationNode::setFill( sal_Int16 _fill ) throw (RuntimeExce mnFill = _fill; } - - // XAnimationNode sal_Int16 SAL_CALL RandomAnimationNode::getFillDefault() throw (RuntimeException, std::exception) { @@ -400,8 +353,6 @@ sal_Int16 SAL_CALL RandomAnimationNode::getFillDefault() throw (RuntimeException return mnFillDefault; } - - // XAnimationNode void SAL_CALL RandomAnimationNode::setFillDefault( sal_Int16 _filldefault ) throw (RuntimeException, std::exception) { @@ -409,8 +360,6 @@ void SAL_CALL RandomAnimationNode::setFillDefault( sal_Int16 _filldefault ) thro mnFillDefault = _filldefault; } - - // XAnimationNode sal_Int16 SAL_CALL RandomAnimationNode::getRestart() throw (RuntimeException, std::exception) { @@ -418,8 +367,6 @@ sal_Int16 SAL_CALL RandomAnimationNode::getRestart() throw (RuntimeException, st return mnRestart; } - - // XAnimationNode void SAL_CALL RandomAnimationNode::setRestart( sal_Int16 _restart ) throw (RuntimeException, std::exception) { @@ -427,8 +374,6 @@ void SAL_CALL RandomAnimationNode::setRestart( sal_Int16 _restart ) throw (Runti mnRestart = _restart; } - - // XAnimationNode sal_Int16 SAL_CALL RandomAnimationNode::getRestartDefault() throw (RuntimeException, std::exception) { @@ -436,8 +381,6 @@ sal_Int16 SAL_CALL RandomAnimationNode::getRestartDefault() throw (RuntimeExcept return mnRestartDefault; } - - // XAnimationNode void SAL_CALL RandomAnimationNode::setRestartDefault( sal_Int16 _restartdefault ) throw (RuntimeException, std::exception) { @@ -445,8 +388,6 @@ void SAL_CALL RandomAnimationNode::setRestartDefault( sal_Int16 _restartdefault mnRestartDefault = _restartdefault; } - - // XAnimationNode double SAL_CALL RandomAnimationNode::getAcceleration() throw (RuntimeException, std::exception) { @@ -454,8 +395,6 @@ double SAL_CALL RandomAnimationNode::getAcceleration() throw (RuntimeException, return mfAcceleration; } - - // XAnimationNode void SAL_CALL RandomAnimationNode::setAcceleration( double _acceleration ) throw (RuntimeException, std::exception) { @@ -463,8 +402,6 @@ void SAL_CALL RandomAnimationNode::setAcceleration( double _acceleration ) throw mfAcceleration = _acceleration; } - - // XAnimationNode double SAL_CALL RandomAnimationNode::getDecelerate() throw (RuntimeException, std::exception) { @@ -472,8 +409,6 @@ double SAL_CALL RandomAnimationNode::getDecelerate() throw (RuntimeException, st return mfDecelerate; } - - // XAnimationNode void SAL_CALL RandomAnimationNode::setDecelerate( double _decelerate ) throw (RuntimeException, std::exception) { @@ -481,8 +416,6 @@ void SAL_CALL RandomAnimationNode::setDecelerate( double _decelerate ) throw (Ru mfDecelerate = _decelerate; } - - // XAnimationNode sal_Bool SAL_CALL RandomAnimationNode::getAutoReverse() throw (RuntimeException, std::exception) { @@ -490,8 +423,6 @@ sal_Bool SAL_CALL RandomAnimationNode::getAutoReverse() throw (RuntimeException, return mbAutoReverse; } - - // XAnimationNode void SAL_CALL RandomAnimationNode::setAutoReverse( sal_Bool _autoreverse ) throw (RuntimeException, std::exception) { @@ -499,24 +430,18 @@ void SAL_CALL RandomAnimationNode::setAutoReverse( sal_Bool _autoreverse ) throw mbAutoReverse = _autoreverse; } - - Sequence< NamedValue > SAL_CALL RandomAnimationNode::getUserData() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return maUserData; } - - void SAL_CALL RandomAnimationNode::setUserData( const Sequence< NamedValue >& _userdata ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); maUserData = _userdata; } - - // XChild Reference< XInterface > SAL_CALL RandomAnimationNode::getParent() throw (RuntimeException, std::exception) { @@ -524,8 +449,6 @@ Reference< XInterface > SAL_CALL RandomAnimationNode::getParent() throw (Runtime return mxParent; } - - // XChild void SAL_CALL RandomAnimationNode::setParent( const Reference< XInterface >& Parent ) throw (NoSupportException, RuntimeException, std::exception) { @@ -533,8 +456,6 @@ void SAL_CALL RandomAnimationNode::setParent( const Reference< XInterface >& Par mxParent = Parent; } - - // XCloneable Reference< XCloneable > SAL_CALL RandomAnimationNode::createClone() throw (RuntimeException, std::exception) { @@ -542,24 +463,18 @@ Reference< XCloneable > SAL_CALL RandomAnimationNode::createClone() throw (Runti return xNewNode; } - - // XElementAccess Type SAL_CALL RandomAnimationNode::getElementType() throw (RuntimeException, std::exception) { return cppu::UnoType<XAnimationNode>::get(); } - - // XElementAccess sal_Bool SAL_CALL RandomAnimationNode::hasElements() throw (RuntimeException, std::exception) { return sal_True; } - - // XEnumerationAccess Reference< XEnumeration > SAL_CALL RandomAnimationNode::createEnumeration() throw (RuntimeException, std::exception) @@ -604,9 +519,6 @@ Reference< XEnumeration > SAL_CALL RandomAnimationNode::createEnumeration() return xEnum; } - - - // XTimeContainer Reference< XAnimationNode > SAL_CALL RandomAnimationNode::insertBefore( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& ) throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) @@ -614,8 +526,6 @@ Reference< XAnimationNode > SAL_CALL RandomAnimationNode::insertBefore( const Re return appendChild( newChild ); } - - // XTimeContainer Reference< XAnimationNode > SAL_CALL RandomAnimationNode::insertAfter( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& ) throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) @@ -623,8 +533,6 @@ Reference< XAnimationNode > SAL_CALL RandomAnimationNode::insertAfter( const Ref return appendChild( newChild ); } - - // XTimeContainer Reference< XAnimationNode > SAL_CALL RandomAnimationNode::replaceChild( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& ) throw( IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) @@ -632,8 +540,6 @@ Reference< XAnimationNode > SAL_CALL RandomAnimationNode::replaceChild( const Re return appendChild( newChild ); } - - // XTimeContainer Reference< XAnimationNode > SAL_CALL RandomAnimationNode::removeChild( const Reference< XAnimationNode >& oldChild ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) @@ -641,8 +547,6 @@ Reference< XAnimationNode > SAL_CALL RandomAnimationNode::removeChild( const Ref return oldChild; } - - // XTimeContainer Reference< XAnimationNode > SAL_CALL RandomAnimationNode::appendChild( const Reference< XAnimationNode >& newChild ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) diff --git a/sd/source/ui/unoidl/sddetect.hxx b/sd/source/ui/unoidl/sddetect.hxx index 342dc10e1547..68eb990a682c 100644 --- a/sd/source/ui/unoidl/sddetect.hxx +++ b/sd/source/ui/unoidl/sddetect.hxx @@ -58,7 +58,6 @@ public: SFX_DECL_XSERVICEINFO_NOFACTORY - // XExtendedFilterDetect virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/sd/source/ui/unoidl/unocpres.cxx b/sd/source/ui/unoidl/unocpres.cxx index a9078a84518e..9cc3db8f0779 100644 --- a/sd/source/ui/unoidl/unocpres.cxx +++ b/sd/source/ui/unoidl/unocpres.cxx @@ -38,7 +38,6 @@ using namespace ::rtl; using namespace ::com::sun::star; - uno::Reference< uno::XInterface > createUnoCustomShow( SdCustomShow* pShow ) { return (cppu::OWeakObject*)new SdXCustomPresentation( pShow, NULL ); @@ -262,7 +261,6 @@ void SAL_CALL SdXCustomPresentation::dispose() throw(uno::RuntimeException, std: mpSdCustomShow = NULL; } - void SAL_CALL SdXCustomPresentation::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) throw(uno::RuntimeException, std::exception) { @@ -272,7 +270,6 @@ void SAL_CALL SdXCustomPresentation::addEventListener( const uno::Reference< lan aDisposeListeners.addInterface(xListener); } - void SAL_CALL SdXCustomPresentation::removeEventListener( const uno::Reference< lang::XEventListener >& aListener ) throw(uno::RuntimeException, std::exception) { if( !bDisposing ) @@ -451,7 +448,6 @@ uno::Sequence< OUString > SAL_CALL SdXCustomPresentationAccess::getElementNames( return aSequence; } - sal_Bool SAL_CALL SdXCustomPresentationAccess::hasByName( const OUString& aName ) throw(uno::RuntimeException, std::exception) { diff --git a/sd/source/ui/unoidl/unocpres.hxx b/sd/source/ui/unoidl/unocpres.hxx index d5fcb35b4016..eada245e9cb7 100644 --- a/sd/source/ui/unoidl/unocpres.hxx +++ b/sd/source/ui/unoidl/unocpres.hxx @@ -30,8 +30,6 @@ #include <cppuhelper/implbase5.hxx> #include <comphelper/servicehelper.hxx> - - class SdXImpressDocument; class SdCustomShow; @@ -94,7 +92,6 @@ public: virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> @@ -156,5 +153,4 @@ inline SdCustomShowList* SdXCustomPresentationAccess::GetCustomShowList() const #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/unoidl/unodoc.cxx b/sd/source/ui/unoidl/unodoc.cxx index 7dc7a3ea2e2e..1869fcde444d 100644 --- a/sd/source/ui/unoidl/unodoc.cxx +++ b/sd/source/ui/unoidl/unodoc.cxx @@ -89,5 +89,4 @@ uno::Reference< uno::XInterface > SAL_CALL SdPresentationDocument_createInstance return uno::Reference< uno::XInterface >( pShell->GetModel() ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx index f674bf0f06dd..6aadffc2d829 100644 --- a/sd/source/ui/unoidl/unolayer.cxx +++ b/sd/source/ui/unoidl/unolayer.cxx @@ -54,7 +54,6 @@ using namespace ::rtl; using namespace ::com::sun::star; - // class SdLayer #define WID_LAYER_LOCKED 1 #define WID_LAYER_PRINTABLE 2 @@ -401,7 +400,6 @@ uno::Reference<uno::XInterface> SAL_CALL SdLayer::getParent (void) return uno::Reference<uno::XInterface> (mxLayerManager, uno::UNO_QUERY); } - void SAL_CALL SdLayer::setParent (const uno::Reference<uno::XInterface >& ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) @@ -427,8 +425,6 @@ void SAL_CALL SdLayer::removeEventListener( const uno::Reference< lang::XEventLi OSL_FAIL("not implemented!"); } - - // class SdLayerManager SdLayerManager::SdLayerManager( SdXImpressDocument& rMyModel ) throw() :mpModel( &rMyModel) @@ -731,8 +727,6 @@ void SdLayerManager::UpdateLayerView( bool modify ) const throw() return NULL; } - - namespace { /** Compare two pointers to <type>SdrLayer</type> objects. diff --git a/sd/source/ui/unoidl/unolayer.hxx b/sd/source/ui/unoidl/unolayer.hxx index 1c1dd5b7d7e5..feb28933f1ce 100644 --- a/sd/source/ui/unoidl/unolayer.hxx +++ b/sd/source/ui/unoidl/unolayer.hxx @@ -102,9 +102,6 @@ private: }; - - - /*********************************************************************** * * ***********************************************************************/ diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index d56b857b68f5..bc970e9c3137 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/presentation/XPresentation2.hpp> #include <com/sun/star/lang/DisposedException.hpp> @@ -104,7 +103,6 @@ #include <com/sun/star/geometry/RealPoint2D.hpp> #include <com/sun/star/util/DateTime.hpp> - #include <drawinglayer/primitive2d/structuretagprimitive2d.hxx> using namespace ::osl; @@ -160,8 +158,6 @@ void SdUnoForbiddenCharsTable::Notify( SfxBroadcaster&, const SfxHint& rHint ) t } } - - const sal_Int32 WID_MODEL_LANGUAGE = 1; const sal_Int32 WID_MODEL_TABSTOP = 2; const sal_Int32 WID_MODEL_VISAREA = 3; @@ -610,7 +606,6 @@ uno::Reference < container::XIndexAccess > SAL_CALL SdXImpressDocument::getViewD { xRet = uno::Reference< container::XIndexAccess >(document::IndexedPropertyValues::create( ::comphelper::getProcessComponentContext() ), uno::UNO_QUERY); - uno::Reference < container::XIndexContainer > xCont( xRet, uno::UNO_QUERY ); DBG_ASSERT( xCont.is(), "SdXImpressDocument::getViewData() failed for OLE object" ); if( xCont.is() ) @@ -693,7 +688,6 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdXImpressDocument::duplicate( con return xDrawPage; } - // XDrawPagesSupplier uno::Reference< drawing::XDrawPages > SAL_CALL SdXImpressDocument::getDrawPages() throw(uno::RuntimeException, std::exception) @@ -1893,8 +1887,6 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r pOut->SetMapMode( MAP_100TH_MM ); pOut->IntersectClipRegion( aVisArea ); - - uno::Reference< frame::XModel > xModel; rSelection >>= xModel; @@ -2327,10 +2319,8 @@ void SAL_CALL SdXImpressDocument::dispose() throw (::com::sun::star::uno::Runtim } } - // class SdDrawPagesAccess - SdDrawPagesAccess::SdDrawPagesAccess( SdXImpressDocument& rMyModel ) throw() : mpModel( &rMyModel) { @@ -2583,10 +2573,8 @@ void SAL_CALL SdDrawPagesAccess::removeEventListener( const uno::Reference< lang OSL_FAIL( "not implemented!" ); } - // class SdMasterPagesAccess - SdMasterPagesAccess::SdMasterPagesAccess( SdXImpressDocument& rMyModel ) throw() : mpModel(&rMyModel) { @@ -2835,10 +2823,8 @@ uno::Sequence< OUString > SAL_CALL SdMasterPagesAccess::getSupportedServiceNames return aSeq; } - // class SdDocLinkTargets - SdDocLinkTargets::SdDocLinkTargets( SdXImpressDocument& rMyModel ) throw() : mpModel( &rMyModel ) { diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index bb2411be297f..3d4adf74dfef 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -88,8 +88,6 @@ using ::com::sun::star::drawing::XShape; extern OUString getPageApiNameFromUiName( const OUString& rUIName ); extern OUString getUiNameFromPageApiNameImpl( const OUString& rApiName ); - - typedef std::map<sal_uIntPtr, SfxExtItemPropertySetInfo*> SdExtPropertySetInfoCache; static SdExtPropertySetInfoCache gImplImpressPropertySetInfoCache; static SdExtPropertySetInfoCache gImplDrawPropertySetInfoCache; @@ -97,9 +95,6 @@ static SdExtPropertySetInfoCache gImplDrawPropertySetInfoCache; typedef std::map<sal_uInt32, uno::Sequence< uno::Type >*> SdTypesCache; static SdTypesCache gImplTypesCache; - - - #define WID_EFFECT 1 #define WID_SPEED 2 #define WID_TEXTEFFECT 3 @@ -128,7 +123,6 @@ static SdTypesCache gImplTypesCache; #define WID_PLACEHOLDERTEXT 24 #define WID_LEGACYFRAGMENT 25 - #define IMPRESS_MAP_ENTRIES \ { OUString(UNO_NAME_OBJ_LEGACYFRAGMENT),WID_LEGACYFRAGMENT, cppu::UnoType<drawing::XShape>::get(), 0, 0},\ { OUString(UNO_NAME_OBJ_ANIMATIONPATH), WID_ANIMPATH, cppu::UnoType<drawing::XShape>::get(), 0, 0},\ @@ -155,7 +149,6 @@ static SdTypesCache gImplTypesCache; { OUString("PlaceholderText"), WID_PLACEHOLDERTEXT, ::cppu::UnoType<OUString>::get(), 0, 0},\ { OUString(), 0, css::uno::Type(), 0, 0 } - static const SfxItemPropertyMapEntry* lcl_GetImpress_SdXShapePropertyGraphicMap_Impl() { diff --git a/sd/source/ui/unoidl/unoobj.hxx b/sd/source/ui/unoidl/unoobj.hxx index ac8353dd961f..93c65a6eb113 100644 --- a/sd/source/ui/unoidl/unoobj.hxx +++ b/sd/source/ui/unoidl/unoobj.hxx @@ -141,5 +141,4 @@ const SvEventDescription* ImplGetSupportedMacroItems(); #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 048d6fe1416e..359bade9b760 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -717,7 +717,6 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName } } - throw lang::IllegalArgumentException(); } case WID_LOOP_SOUND: @@ -1384,7 +1383,6 @@ Reference< drawing::XShape > SdGenericDrawPage::_CreateShape(SdrObject *pObj) c if(!xShape.is()) xShape = SvxFmDrawPage::_CreateShape( pObj ); - if( eKind != PRESOBJ_NONE ) { OUString aShapeType("com.sun.star.presentation."); @@ -1466,8 +1464,6 @@ Reference< drawing::XShape > SdGenericDrawPage::_CreateShape(SdrObject *pObj) c } - - // XServiceInfo Sequence< OUString > SAL_CALL SdGenericDrawPage::getSupportedServiceNames() throw(uno::RuntimeException, std::exception) @@ -1479,8 +1475,6 @@ Sequence< OUString > SAL_CALL SdGenericDrawPage::getSupportedServiceNames() return aSeq; } - - // XLinkTargetSupplier Reference< container::XNameAccess > SAL_CALL SdGenericDrawPage::getLinks( ) throw(uno::RuntimeException, std::exception) @@ -1488,22 +1482,16 @@ Reference< container::XNameAccess > SAL_CALL SdGenericDrawPage::getLinks( ) return new SdPageLinkTargets( (SdGenericDrawPage*)this ); } - - void SdGenericDrawPage::setBackground( const Any& ) throw(lang::IllegalArgumentException) { OSL_FAIL( "Don't call me, I'm useless!" ); } - - void SdGenericDrawPage::getBackground( Any& ) throw() { OSL_FAIL( "Don't call me, I'm useless!" ); } - - OUString SdGenericDrawPage::getBookmarkURL() const { OUStringBuffer aRet; @@ -1522,7 +1510,6 @@ OUString SdGenericDrawPage::getBookmarkURL() const return aRet.makeStringAndClear(); } - void SdGenericDrawPage::setBookmarkURL( OUString& rURL ) { if( SvxFmDrawPage::mpPage ) @@ -1544,7 +1531,6 @@ void SdGenericDrawPage::setBookmarkURL( OUString& rURL ) } } - Reference< drawing::XShape > SAL_CALL SdGenericDrawPage::combine( const Reference< drawing::XShapes >& xShapes ) throw( uno::RuntimeException, std::exception ) { @@ -1581,7 +1567,6 @@ Reference< drawing::XShape > SAL_CALL SdGenericDrawPage::combine( const Referenc return xShape; } - void SAL_CALL SdGenericDrawPage::split( const Reference< drawing::XShape >& xGroup ) throw( uno::RuntimeException, std::exception ) { @@ -1600,7 +1585,6 @@ void SAL_CALL SdGenericDrawPage::split( const Reference< drawing::XShape >& xGro GetModel()->SetModified(); } - Reference< drawing::XShape > SAL_CALL SdGenericDrawPage::bind( const Reference< drawing::XShapes >& xShapes ) throw( uno::RuntimeException, std::exception ) { @@ -1634,7 +1618,6 @@ Reference< drawing::XShape > SAL_CALL SdGenericDrawPage::bind( const Reference< return xShape; } - void SAL_CALL SdGenericDrawPage::unbind( const Reference< drawing::XShape >& xShape ) throw( uno::RuntimeException, std::exception ) { @@ -1858,11 +1841,9 @@ Reference< XAnimationNode > SAL_CALL SdGenericDrawPage::getAnimationNode() throw SdPage *pSdPage = static_cast<SdPage*>(SvxFmDrawPage::mpPage); - return pSdPage->getAnimationNode(); } - // SdPageLinkTargets SdPageLinkTargets::SdPageLinkTargets( SdGenericDrawPage* pUnoPage ) throw() { @@ -2019,7 +2000,6 @@ Sequence< OUString > SAL_CALL SdPageLinkTargets::getSupportedServiceNames() return aSeq; } - // SdDrawPage SdDrawPage::SdDrawPage( SdXImpressDocument* pModel, SdPage* pPage ) throw() : SdGenericDrawPage( pModel, pPage, ImplGetDrawPagePropertySet( pModel->IsImpressDocument(), pPage->GetPageKind() ) ) @@ -2146,7 +2126,6 @@ OUString getPageApiName( SdPage* pPage ) return aPageName; } - OUString getPageApiNameFromUiName( const OUString& rUIName ) { OUString aApiName; @@ -3104,7 +3083,6 @@ void SAL_CALL SdMasterPage::remove( const Reference< drawing::XShape >& xShape ) SdGenericDrawPage::remove( xShape ); } - Reference< uno::XInterface > createUnoPageImpl( SdPage* pPage ) { Reference< uno::XInterface > xPage; diff --git a/sd/source/ui/unoidl/unopage.hxx b/sd/source/ui/unoidl/unopage.hxx index c19b2125bd42..62a3b245864f 100644 --- a/sd/source/ui/unoidl/unopage.hxx +++ b/sd/source/ui/unoidl/unopage.hxx @@ -279,7 +279,6 @@ public: std::exception) SAL_OVERRIDE; }; - /*********************************************************************** * * ***********************************************************************/ diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx index cd795477b90d..63a5a3fb416f 100644 --- a/sd/source/ui/unoidl/unosrch.cxx +++ b/sd/source/ui/unoidl/unosrch.cxx @@ -61,7 +61,6 @@ public: SearchContext_impl( uno::Reference< drawing::XShapes > xShapes, SearchContext_impl* pParent = NULL ) : mxShapes( xShapes ), mnIndex( -1 ), mpParent( pParent ) {} - uno::Reference< drawing::XShape > firstShape() { mnIndex = -1; @@ -209,7 +208,6 @@ uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL SdUnoSearch if( pDescr == NULL ) return uno::Reference< container::XIndexAccess > (); - sal_Int32 nSequence = 32; sal_Int32 nFound = 0; @@ -816,7 +814,6 @@ void SAL_CALL SdUnoSearchReplaceDescriptor::removePropertyChangeListener( const void SAL_CALL SdUnoSearchReplaceDescriptor::addVetoableChangeListener( const OUString& , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) {} void SAL_CALL SdUnoSearchReplaceDescriptor::removeVetoableChangeListener( const OUString& , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) {} - /* ================================================================= */ SdUnoFindAllAccess::SdUnoFindAllAccess( uno::Sequence< uno::Reference< uno::XInterface > >& rSequence ) throw() diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index 59106a7454e7..def627d9988f 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/beans/XPropertySet.hpp> #include "DocumentRenderer.hxx" @@ -57,12 +56,10 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; - namespace sd { namespace { - /** Convenience class to extract values from the sequence of properties given to one of the XRenderable methods. */ @@ -245,8 +242,6 @@ namespace { } }; - - /** A collection of values that helps to reduce the number of arguments given to some functions. Note that not all values are set at the same time. @@ -279,8 +274,6 @@ namespace { const bool mbPrintMarkedOnly; }; - - /** Output one page of the document to the given printer. Note that more than one document page may be output to one printer page. */ @@ -314,9 +307,6 @@ namespace { rPrintView.HideSdrPage(); } - - - /** Output a string (that typically is not part of a document page) to the given printer. */ @@ -331,9 +321,6 @@ namespace { rPrinter.SetFont(aOriginalFont); } - - - /** Read the resource file and process it into a sequence of properties that can be passed to the printing dialog. */ @@ -441,7 +428,6 @@ namespace { AddDialogControl( vcl::PrinterOptionsHelper::setSubgroupControlOpt("contents", SD_RESSTR(_STR_IMPRESS_PRINT_UI_INCLUDE_CONTENT), "" ) ); - if( mbImpress ) { AddDialogControl( vcl::PrinterOptionsHelper::setBoolControlOpt("printname", @@ -660,9 +646,6 @@ namespace { } }; - - - /** The Prepare... methods of the DocumentRenderer::Implementation class create a set of PrinterPage objects that contain all necessary information to do the actual printing. There is one PrinterPage @@ -723,9 +706,6 @@ namespace { const sal_uInt16 mnPaperTray; }; - - - /** The RegularPrinterPage is used for printing one regular slide (no notes, handout, or outline) to one printer page. */ @@ -780,9 +760,6 @@ namespace { const sal_uInt16 mnPageIndex; }; - - - /** Print one slide multiple times on a printer page so that the whole printer page is covered. */ @@ -942,9 +919,6 @@ namespace { const Point maSecondOffset; }; - - - /** One handout page displays one to nine slides. */ class HandoutPrinterPage : public PrinterPage @@ -1087,9 +1061,6 @@ namespace { const ::std::vector<sal_uInt16> maPageIndices; }; - - - /** The outline information (title, subtitle, outline objects) of the document. There is no fixed mapping of slides to printer pages. */ @@ -1165,7 +1136,6 @@ namespace { }; } - //===== DocumentRenderer::Implementation ====================================== class DocumentRenderer::Implementation @@ -1190,17 +1160,11 @@ public: StartListening(mrBase); } - - - virtual ~Implementation() { EndListening(mrBase); } - - - virtual void Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint) SAL_OVERRIDE { const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint); @@ -1212,8 +1176,6 @@ public: } } - - /** Process the sequence of properties given to one of the XRenderable methods. */ @@ -1253,8 +1215,6 @@ public: PreparePages(); } - - /** Return the number of pages that are to be printed. */ sal_Int32 GetPrintPageCount() @@ -1266,8 +1226,6 @@ public: return maPrinterPages.size(); } - - /** Return a sequence of properties that can be returned by the XRenderable::getRenderer() method. */ @@ -1291,9 +1249,6 @@ public: return aProperties; } - - - /** Print one of the prepared pages. */ void PrintPage (const sal_Int32 nIndex) @@ -1330,7 +1285,6 @@ public: const MapMode aSavedMapMode (rPrinter.GetMapMode()); const sal_uInt16 nSavedPaperBin (rPrinter.GetPaperBin()); - // Set page orientation. if ( ! rPrinter.SetOrientation(pPage->GetOrientation())) { @@ -1373,9 +1327,6 @@ public: rPrinter.SetPaperBin(nSavedPaperBin); } - - - private: // rhbz#657394: keep the document alive: prevents crash when SfxObjectShellRef mxObjectShell; // destroying mpPrintView @@ -1436,8 +1387,6 @@ private: return true; } - - /** Top most method for preparing printer pages. In this and the other Prepare... methods the various special cases are detected and handled. @@ -1522,9 +1471,6 @@ private: } } - - - /** Create the page objects of the handout template. When the actual printing takes place then the page objects are assigned different sets of slides for each printed page (see HandoutPrinterPage::Print). @@ -1603,9 +1549,6 @@ private: } } - - - /** Detect whether the specified slide is to be printed. @return When the slide is not to be printed then <NULL/> is returned. @@ -1628,9 +1571,6 @@ private: return NULL; } - - - /** Prepare the outline of the document for printing. There is no fixed number of slides whose outline data is put onto one printer page. If the current printer page has enough room for the outline of the @@ -1788,9 +1728,6 @@ private: pOutliner->Init(nSavedOutlMode); } - - - /** Prepare handout pages for slides that are to be printed. */ void PrepareHandout (PrintInfo& rInfo) @@ -1905,9 +1842,6 @@ private: } } - - - /** Prepare the notes pages or regular slides. */ void PrepareStdOrNotes ( @@ -1935,9 +1869,6 @@ private: PrepareRegularPages(ePageKind, rInfo); } - - - /** Prepare slides in a non-booklet way: one slide per one to many printer pages. */ @@ -2022,9 +1953,6 @@ private: } } - - - /** Put two slides on one printer page. */ void PrepareBooklet ( @@ -2148,9 +2076,6 @@ private: } } - - - /** Print one slide multiple times on one printer page so that the whole printer page is covered. */ @@ -2180,8 +2105,6 @@ private: nPaperBin))); } - - /** Print one standard slide or notes page on one to many printer pages. More than on printer page is used when the slide is larger than the printable area. @@ -2270,9 +2193,6 @@ private: } }; - - - //===== DocumentRenderer ====================================================== DocumentRenderer::DocumentRenderer (ViewShellBase& rBase) @@ -2281,16 +2201,10 @@ DocumentRenderer::DocumentRenderer (ViewShellBase& rBase) { } - - - DocumentRenderer::~DocumentRenderer() { } - - - //----- XRenderable ----------------------------------------------------------- sal_Int32 SAL_CALL DocumentRenderer::getRendererCount ( @@ -2303,9 +2217,6 @@ sal_Int32 SAL_CALL DocumentRenderer::getRendererCount ( return mpImpl->GetPrintPageCount(); } - - - Sequence<beans::PropertyValue> SAL_CALL DocumentRenderer::getRenderer ( sal_Int32 nRenderer, const css::uno::Any& rSelection, @@ -2318,9 +2229,6 @@ Sequence<beans::PropertyValue> SAL_CALL DocumentRenderer::getRenderer ( return mpImpl->GetProperties(rOptions); } - - - void SAL_CALL DocumentRenderer::render ( sal_Int32 nRenderer, const css::uno::Any& rSelection, @@ -2332,8 +2240,6 @@ void SAL_CALL DocumentRenderer::render ( mpImpl->PrintPage(nRenderer); } - - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/view/FormShellManager.cxx b/sd/source/ui/view/FormShellManager.cxx index 1225f8d61bcc..3d2cb47c0a3b 100644 --- a/sd/source/ui/view/FormShellManager.cxx +++ b/sd/source/ui/view/FormShellManager.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "FormShellManager.hxx" #include "EventMultiplexer.hxx" @@ -48,7 +47,6 @@ private: } // end of anonymous namespace - FormShellManager::FormShellManager (ViewShellBase& rBase) : mrBase(rBase), mpFormShell(NULL), @@ -69,9 +67,6 @@ FormShellManager::FormShellManager (ViewShellBase& rBase) RegisterAtCenterPane(); } - - - FormShellManager::~FormShellManager (void) { SetFormShell(NULL); @@ -89,9 +84,6 @@ FormShellManager::~FormShellManager (void) } } - - - void FormShellManager::SetFormShell (FmFormShell* pFormShell) { if (mpFormShell != pFormShell) @@ -134,13 +126,6 @@ void FormShellManager::SetFormShell (FmFormShell* pFormShell) } } - - - - - - - void FormShellManager::RegisterAtCenterPane (void) { ViewShell* pShell = mrBase.GetMainViewShell().get(); @@ -171,9 +156,6 @@ void FormShellManager::RegisterAtCenterPane (void) mrBase.GetViewShellManager()->ActivateSubShell(*pShell, RID_FORMLAYER_TOOLBOX); } - - - void FormShellManager::UnregisterAtCenterPane (void) { if (mpMainViewShellWindow != NULL) @@ -201,9 +183,6 @@ void FormShellManager::UnregisterAtCenterPane (void) mpSubShellFactory.reset(); } - - - IMPL_LINK_NOARG(FormShellManager, FormControlActivated) { // The form shell has been activated. To give it priority in reacting to @@ -221,9 +200,6 @@ IMPL_LINK_NOARG(FormShellManager, FormControlActivated) return 0; } - - - IMPL_LINK(FormShellManager, ConfigurationUpdateHandler, sd::tools::EventMultiplexerEvent*, pEvent) { switch (pEvent->meEventId) @@ -251,9 +227,6 @@ IMPL_LINK(FormShellManager, ConfigurationUpdateHandler, sd::tools::EventMultiple return 0; } - - - IMPL_LINK(FormShellManager, WindowEventHandler, VclWindowEvent*, pEvent) { if (pEvent != NULL) @@ -295,9 +268,6 @@ IMPL_LINK(FormShellManager, WindowEventHandler, VclWindowEvent*, pEvent) return 0; } - - - void FormShellManager::Notify(SfxBroadcaster&, const SfxHint& rHint) { const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint); @@ -318,10 +288,6 @@ void FormShellManager::Notify(SfxBroadcaster&, const SfxHint& rHint) } } - - - - //===== FormShellManagerFactory =============================================== namespace { @@ -334,9 +300,6 @@ FormShellManagerFactory::FormShellManagerFactory ( { } - - - FmFormShell* FormShellManagerFactory::CreateShell ( ::sd::ShellId nId, ::Window*, @@ -354,9 +317,6 @@ FmFormShell* FormShellManagerFactory::CreateShell ( return pShell; } - - - void FormShellManagerFactory::ReleaseShell (SfxShell* pShell) { if (pShell != NULL) diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx index e66ad9863782..83b41756f04f 100644 --- a/sd/source/ui/view/GraphicObjectBar.cxx +++ b/sd/source/ui/view/GraphicObjectBar.cxx @@ -60,12 +60,8 @@ void GraphicObjectBar::InitInterface_Impl() { } - - TYPEINIT1( GraphicObjectBar, SfxShell ); - - GraphicObjectBar::GraphicObjectBar ( ViewShell* pSdViewShell, ::sd::View* pSdView ) @@ -83,23 +79,17 @@ GraphicObjectBar::GraphicObjectBar ( SetName( OUString( "Graphic objectbar" )); } - - GraphicObjectBar::~GraphicObjectBar() { SetRepeatTarget( NULL ); } - - void GraphicObjectBar::GetAttrState( SfxItemSet& rSet ) { if( mpView ) SvxGrafAttrHelper::GetGrafAttrState( rSet, *mpView ); } - - void GraphicObjectBar::Execute( SfxRequest& rReq ) { if( mpView ) @@ -109,8 +99,6 @@ void GraphicObjectBar::Execute( SfxRequest& rReq ) } } - - void GraphicObjectBar::GetFilterState( SfxItemSet& rSet ) { const SdrMarkList& rMarkList = mpView->GetMarkedObjectList(); @@ -128,8 +116,6 @@ void GraphicObjectBar::GetFilterState( SfxItemSet& rSet ) SvxGraphicFilter::DisableGraphicFilterSlots( rSet ); } - - void GraphicObjectBar::ExecuteFilter( SfxRequest& rReq ) { const SdrMarkList& rMarkList = mpView->GetMarkedObjectList(); diff --git a/sd/source/ui/view/GraphicViewShellBase.cxx b/sd/source/ui/view/GraphicViewShellBase.cxx index 06e99bd0453a..8343917fd8db 100644 --- a/sd/source/ui/view/GraphicViewShellBase.cxx +++ b/sd/source/ui/view/GraphicViewShellBase.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "GraphicViewShellBase.hxx" #include "GraphicDocShell.hxx" @@ -53,13 +52,6 @@ void GraphicViewShellBase::InitFactory() SFX_VIEW_REGISTRATION(GraphicDocShell); } - - - - - - - GraphicViewShellBase::GraphicViewShellBase ( SfxViewFrame* _pFrame, SfxViewShell* pOldShell) @@ -67,16 +59,10 @@ GraphicViewShellBase::GraphicViewShellBase ( { } - - - GraphicViewShellBase::~GraphicViewShellBase (void) { } - - - void GraphicViewShellBase::Execute (SfxRequest& rRequest) { sal_uInt16 nSlotId = rRequest.GetSlot(); @@ -105,9 +91,6 @@ void GraphicViewShellBase::Execute (SfxRequest& rRequest) } - - - void GraphicViewShellBase::InitializeFramework (void) { com::sun::star::uno::Reference<com::sun::star::frame::XController> @@ -115,7 +98,6 @@ void GraphicViewShellBase::InitializeFramework (void) sd::framework::DrawModule::Initialize(xController); } - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/view/ImpressViewShellBase.cxx b/sd/source/ui/view/ImpressViewShellBase.cxx index 7e281440a96c..fce039e97427 100644 --- a/sd/source/ui/view/ImpressViewShellBase.cxx +++ b/sd/source/ui/view/ImpressViewShellBase.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ImpressViewShellBase.hxx" #include "DrawDocShell.hxx" @@ -54,13 +53,6 @@ void ImpressViewShellBase::InitFactory() SFX_VIEW_REGISTRATION(DrawDocShell); } - - - - - - - ImpressViewShellBase::ImpressViewShellBase ( SfxViewFrame* _pFrame, SfxViewShell* pOldShell) @@ -69,17 +61,11 @@ ImpressViewShellBase::ImpressViewShellBase ( MasterPageObserver::Instance().RegisterDocument (*GetDocShell()->GetDoc()); } - - - ImpressViewShellBase::~ImpressViewShellBase (void) { MasterPageObserver::Instance().UnregisterDocument (*GetDocShell()->GetDoc()); } - - - void ImpressViewShellBase::Execute (SfxRequest& rRequest) { sal_uInt16 nSlotId = rRequest.GetSlot(); @@ -98,9 +84,6 @@ void ImpressViewShellBase::Execute (SfxRequest& rRequest) } } - - - void ImpressViewShellBase::InitializeFramework (void) { ::com::sun::star::uno::Reference<com::sun::star::frame::XController> diff --git a/sd/source/ui/view/MediaObjectBar.cxx b/sd/source/ui/view/MediaObjectBar.cxx index 612faa216aa7..8d074fa12c05 100644 --- a/sd/source/ui/view/MediaObjectBar.cxx +++ b/sd/source/ui/view/MediaObjectBar.cxx @@ -72,15 +72,11 @@ MediaObjectBar::MediaObjectBar( ViewShell* pSdViewShell, ::sd::View* pSdView ) : SetName(SD_RESSTR(RID_DRAW_MEDIA_TOOLBOX)); } - - MediaObjectBar::~MediaObjectBar() { SetRepeatTarget( NULL ); } - - void MediaObjectBar::GetState( SfxItemSet& rSet ) { SfxWhichIter aIter( rSet ); @@ -115,8 +111,6 @@ void MediaObjectBar::GetState( SfxItemSet& rSet ) } } - - void MediaObjectBar::Execute( SfxRequest& rReq ) { if( SID_AVMEDIA_TOOLBOX == rReq.GetSlot() ) diff --git a/sd/source/ui/view/OutlineViewShellBase.cxx b/sd/source/ui/view/OutlineViewShellBase.cxx index 87d69a1a1e35..d032eb8dba3d 100644 --- a/sd/source/ui/view/OutlineViewShellBase.cxx +++ b/sd/source/ui/view/OutlineViewShellBase.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "OutlineViewShellBase.hxx" #include "sdresid.hxx" #include "DrawDocShell.hxx" @@ -51,9 +50,6 @@ void OutlineViewShellBase::InitFactory() SFX_VIEW_REGISTRATION(DrawDocShell); } - - - OutlineViewShellBase::OutlineViewShellBase ( SfxViewFrame* _pFrame, SfxViewShell* pOldShell) @@ -61,16 +57,10 @@ OutlineViewShellBase::OutlineViewShellBase ( { } - - - OutlineViewShellBase::~OutlineViewShellBase (void) { } - - - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index f7149a46c208..ebbc0f5822cc 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -125,9 +125,6 @@ private: OutlinerView* mpOutlineView; }; - - - Outliner::Outliner( SdDrawDocument* pDoc, sal_uInt16 nMode ) : SdrOutliner( &pDoc->GetItemPool(), nMode ), mpImpl(new Implementation()), @@ -224,18 +221,12 @@ Outliner::Outliner( SdDrawDocument* pDoc, sal_uInt16 nMode ) SetDefaultLanguage( Application::GetSettings().GetLanguageTag().getLanguageType() ); } - - - /// Nothing spectecular in the destructor. Outliner::~Outliner (void) { mpImpl.reset(); } - - - /** Prepare find&replace or spellchecking. This distinguishes between three cases: <ol> @@ -287,10 +278,6 @@ void Outliner::PrepareSpelling (void) ClearModifyFlag(); } - - - - void Outliner::StartSpelling (void) { meMode = SPELL; @@ -446,9 +433,6 @@ bool Outliner::SpellNextDocument() return aResult; } - - - /** Go to next match. */ bool Outliner::StartSearchAndReplace (const SvxSearchItem* pSearchItem) @@ -530,9 +514,6 @@ bool Outliner::StartSearchAndReplace (const SvxSearchItem* pSearchItem) return bEndOfSearch; } - - - void Outliner::Initialize (bool bDirectionIsForward) { const bool bIsAtEnd (maObjectIterator == ::sd::outliner::OutlinerContainer(this).end()); @@ -600,9 +581,6 @@ void Outliner::Initialize (bool bDirectionIsForward) maLastValidPosition = *::sd::outliner::OutlinerContainer(this).current(); } - - - bool Outliner::SearchAndReplaceAll (void) { // Save the current position to be restored after having replaced all @@ -651,9 +629,6 @@ bool Outliner::SearchAndReplaceAll (void) return true; } - - - bool Outliner::SearchAndReplaceOnce (void) { DetectChange (); @@ -745,9 +720,6 @@ bool Outliner::SearchAndReplaceOnce (void) return mbEndOfSearch; } - - - /** Try to detect whether the document or the view (shell) has changed since the last time <member>StartSearchAndReplace()</member> has been called. */ @@ -920,7 +892,6 @@ void Outliner::RestoreStartPosition() if (pDrawViewShell.get() != NULL) SetPage (meStartEditMode, mnStartPageIndex); - if (mpStartEditedObject != NULL) { // Turn on the text toolbar as it is done in FuText so that @@ -950,9 +921,6 @@ void Outliner::RestoreStartPosition() } } - - - /** The main purpose of this method is to iterate over all shape objects of the search area (current selection, current view, or whole document) until a text object has been found that contains at least one match or @@ -1029,9 +997,6 @@ void Outliner::ProvideNextTextObject (void) while ( ! (mbFoundObject || mbEndOfSearch)); } - - - void Outliner::EndOfSearch (void) { ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock()); @@ -1155,18 +1120,12 @@ bool Outliner::ShowWrapArroundDialog (void) return bDoWrapArround; } - - - bool Outliner::IsValidTextObject (const ::sd::outliner::IteratorPosition& rPosition) { SdrTextObj* pObject = dynamic_cast< SdrTextObj* >( rPosition.mxObject.get() ); return (pObject != NULL) && pObject->HasText() && ! pObject->IsEmptyPresObj(); } - - - void Outliner::PutTextIntoOutliner() { mpTextObj = dynamic_cast<SdrTextObj*>( mpObj ); @@ -1188,9 +1147,6 @@ void Outliner::PutTextIntoOutliner() } } - - - void Outliner::PrepareSpellCheck (void) { EESpellState eState = HasSpellErrors(); @@ -1225,9 +1181,6 @@ void Outliner::PrepareSpellCheck (void) } } - - - void Outliner::PrepareSearchAndReplace (void) { if (HasText( *mpSearchItem )) @@ -1246,9 +1199,6 @@ void Outliner::PrepareSearchAndReplace (void) } } - - - void Outliner::SetViewMode (PageKind ePageKind) { ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock()); @@ -1313,9 +1263,6 @@ void Outliner::SetViewMode (PageKind ePageKind) } } - - - void Outliner::SetPage (EditMode eEditMode, sal_uInt16 nPageIndex) { if ( ! mbRestrictSearchToSelection) @@ -1332,9 +1279,6 @@ void Outliner::SetPage (EditMode eEditMode, sal_uInt16 nPageIndex) } } - - - void Outliner::EnterEditMode (bool bGrabFocus) { OutlinerView* pOutlinerView = mpImpl->GetOutlinerView(); @@ -1369,9 +1313,6 @@ void Outliner::EnterEditMode (bool bGrabFocus) } } - - - /** * SpellChecker: Error link handler */ @@ -1385,9 +1326,6 @@ IMPL_LINK_INLINE_START( Outliner, SpellError, void *, nLang ) } IMPL_LINK_INLINE_END( Outliner, SpellError, void *, nLang ) - - - ESelection Outliner::GetSearchStartPosition (void) { ESelection aPosition; @@ -1414,9 +1352,6 @@ ESelection Outliner::GetSearchStartPosition (void) return aPosition; } - - - bool Outliner::HasNoPreviousMatch (void) { OutlinerView* pOutlinerView = mpImpl->GetOutlinerView(); @@ -1428,9 +1363,6 @@ bool Outliner::HasNoPreviousMatch (void) return pOutlinerView->GetSelection().IsEqual(GetSearchStartPosition ()); } - - - bool Outliner::HandleFailedSearch (void) { bool bContinueSearch = false; @@ -1459,7 +1391,6 @@ bool Outliner::HandleFailedSearch (void) return bContinueSearch; } - SdrObject* Outliner::SetObject ( const ::sd::outliner::IteratorPosition& rPosition) { @@ -1469,9 +1400,6 @@ SdrObject* Outliner::SetObject ( return rPosition.mxObject.get(); } - - - void Outliner::SetViewShell (const ::boost::shared_ptr<ViewShell>& rpViewShell) { ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock()); @@ -1501,9 +1429,6 @@ void Outliner::SetViewShell (const ::boost::shared_ptr<ViewShell>& rpViewShell) } } - - - void Outliner::HandleChangedSelection (void) { maMarkListCopy.clear(); @@ -1526,10 +1451,6 @@ void Outliner::HandleChangedSelection (void) } } - - - - void Outliner::StartConversion( sal_Int16 nSourceLanguage, sal_Int16 nTargetLanguage, const Font *pTargetFont, sal_Int32 nOptions, bool bIsInteractive ) { @@ -1558,9 +1479,6 @@ void Outliner::StartConversion( sal_Int16 nSourceLanguage, sal_Int16 nTargetLan EndConversion(); } - - - /** Prepare to do a text conversion on the current text object. This includes putting it into edit mode. */ @@ -1585,9 +1503,6 @@ void Outliner::PrepareConversion (void) } } - - - void Outliner::BeginConversion (void) { SetRefDevice( SD_MOD()->GetRefDevice( *mpDrawDocument->GetDocSh() ) ); @@ -1617,17 +1532,11 @@ void Outliner::BeginConversion (void) ClearModifyFlag(); } - - - void Outliner::EndConversion() { EndSpelling(); } - - - bool Outliner::ConvertNextDocument() { ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock()); @@ -1664,9 +1573,6 @@ bool Outliner::ConvertNextDocument() return !mbEndOfSearch; } - - - sal_uInt16 Outliner::ShowModalMessageBox (Dialog& rMessageBox) { // We assume that the parent of the given messge box is NULL, i.e. it is @@ -1709,9 +1615,6 @@ sal_uInt16 Outliner::ShowModalMessageBox (Dialog& rMessageBox) return nResult; } - - - //===== Outliner::Implementation ============================================== Outliner::Implementation::Implementation (void) @@ -1721,9 +1624,6 @@ Outliner::Implementation::Implementation (void) { } - - - Outliner::Implementation::~Implementation (void) { if (mbOwnOutlineView && mpOutlineView!=NULL) @@ -1734,13 +1634,6 @@ Outliner::Implementation::~Implementation (void) } } - - - - - - - /** We try to create a new OutlinerView only when there is none available, either from an OutlinerViewShell or a previous call to ProvideOutlinerView(). This is necessary to support the spell checker @@ -1805,9 +1698,6 @@ void Outliner::Implementation::ProvideOutlinerView ( } } - - - void Outliner::Implementation::ReleaseOutlinerView (void) { if (mbOwnOutlineView) diff --git a/sd/source/ui/view/OutlinerIterator.cxx b/sd/source/ui/view/OutlinerIterator.cxx index 08bcae47deae..d755b92277ba 100644 --- a/sd/source/ui/view/OutlinerIterator.cxx +++ b/sd/source/ui/view/OutlinerIterator.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "OutlinerIterator.hxx" #include "OutlinerIteratorImpl.hxx" #include <svx/svditer.hxx> @@ -35,7 +34,6 @@ namespace sd { namespace outliner { - //===== IteratorPosition ====================================================== IteratorPosition::IteratorPosition (void) @@ -78,9 +76,6 @@ bool IteratorPosition::operator== (const IteratorPosition& aPosition) const && meEditMode == aPosition.meEditMode; } - - - //===== Iterator ============================================================== Iterator::Iterator() @@ -178,7 +173,6 @@ Iterator OutlinerContainer::current (void) return CreateIterator (CURRENT); } - Iterator OutlinerContainer::CreateIterator (IteratorLocation aLocation) { // Decide on certain features of the outliner which kind of iterator to @@ -366,9 +360,6 @@ sal_Int32 OutlinerContainer::GetPageIndex ( return nPageIndex; } - - - //===== IteratorImplBase ==================================================== IteratorImplBase::IteratorImplBase(SdDrawDocument* pDocument, @@ -428,9 +419,6 @@ const IteratorPosition& IteratorImplBase::GetPosition (void) return maPosition; } - - - IteratorImplBase* IteratorImplBase::Clone (IteratorImplBase* pObject) const { if (pObject != NULL) @@ -443,15 +431,11 @@ IteratorImplBase* IteratorImplBase::Clone (IteratorImplBase* pObject) const return pObject; } - - void IteratorImplBase::Reverse (void) { mbDirectionIsForward = ! mbDirectionIsForward; } - - //===== SelectionIteratorImpl =========================================== SelectionIteratorImpl::SelectionIteratorImpl ( @@ -478,7 +462,6 @@ IteratorImplBase* SelectionIteratorImpl::Clone (IteratorImplBase* pObject) const return pIterator; } - void SelectionIteratorImpl::GotoNextText (void) { SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( mrObjectList.at(mnObjectIndex).get() ); @@ -527,7 +510,6 @@ void SelectionIteratorImpl::GotoNextText (void) } } - const IteratorPosition& SelectionIteratorImpl::GetPosition (void) { maPosition.mxObject = mrObjectList.at(mnObjectIndex); @@ -535,13 +517,11 @@ const IteratorPosition& SelectionIteratorImpl::GetPosition (void) return maPosition; } - bool SelectionIteratorImpl::operator== (const IteratorImplBase& rIterator) const { return rIterator.IsEqual (*this, SELECTION); } - bool SelectionIteratorImpl::IsEqual ( const IteratorImplBase& rIterator, IteratorType aType) const @@ -557,9 +537,6 @@ bool SelectionIteratorImpl::IsEqual ( return false; } - - - //===== ViewIteratorImpl ================================================ ViewIteratorImpl::ViewIteratorImpl ( @@ -575,9 +552,6 @@ ViewIteratorImpl::ViewIteratorImpl ( SetPage (nPageIndex); } - - - ViewIteratorImpl::ViewIteratorImpl ( sal_Int32 nPageIndex, SdDrawDocument* pDocument, @@ -593,16 +567,10 @@ ViewIteratorImpl::ViewIteratorImpl ( SetPage (nPageIndex); } - - - ViewIteratorImpl::~ViewIteratorImpl (void) { } - - - IteratorImplBase* ViewIteratorImpl::Clone (IteratorImplBase* pObject) const { @@ -628,8 +596,6 @@ IteratorImplBase* ViewIteratorImpl::Clone (IteratorImplBase* pObject) const return pIterator; } - - void ViewIteratorImpl::GotoNextText(void) { SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( maPosition.mxObject.get() ); @@ -678,9 +644,6 @@ void ViewIteratorImpl::GotoNextText(void) } } - - - void ViewIteratorImpl::SetPage (sal_Int32 nPageIndex) { mbPageChangeOccurred = (maPosition.mnPageIndex!=nPageIndex); @@ -737,9 +700,6 @@ void ViewIteratorImpl::SetPage (sal_Int32 nPageIndex) } - - - void ViewIteratorImpl::Reverse (void) { IteratorImplBase::Reverse (); @@ -763,9 +723,6 @@ void ViewIteratorImpl::Reverse (void) maPosition.mxObject.reset(mpObjectIterator->Next()); } - - - //===== DocumentIteratorImpl ============================================ DocumentIteratorImpl::DocumentIteratorImpl ( @@ -783,15 +740,9 @@ DocumentIteratorImpl::DocumentIteratorImpl ( mnPageCount = pDocument->GetMasterSdPageCount(ePageKind); } - - - DocumentIteratorImpl::~DocumentIteratorImpl (void) {} - - - IteratorImplBase* DocumentIteratorImpl::Clone (IteratorImplBase* pObject) const { DocumentIteratorImpl* pIterator = static_cast<DocumentIteratorImpl*>(pObject); @@ -803,9 +754,6 @@ IteratorImplBase* DocumentIteratorImpl::Clone (IteratorImplBase* pObject) const return ViewIteratorImpl::Clone (pIterator); } - - - void DocumentIteratorImpl::GotoNextText (void) { bool bSetToOnePastLastPage = false; @@ -886,7 +834,6 @@ void DocumentIteratorImpl::GotoNextText (void) } } - } } // end of namespace ::sd::outliner /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/view/PresentationViewShellBase.cxx b/sd/source/ui/view/PresentationViewShellBase.cxx index f0e1f52e2302..34f6b2dbe38a 100644 --- a/sd/source/ui/view/PresentationViewShellBase.cxx +++ b/sd/source/ui/view/PresentationViewShellBase.cxx @@ -60,9 +60,6 @@ void PresentationViewShellBase::InitFactory() SFX_VIEW_REGISTRATION(DrawDocShell); } - - - PresentationViewShellBase::PresentationViewShellBase ( SfxViewFrame* _pFrame, SfxViewShell* pOldShell) @@ -82,15 +79,10 @@ PresentationViewShellBase::PresentationViewShellBase ( } } - - - PresentationViewShellBase::~PresentationViewShellBase (void) { } - - void PresentationViewShellBase::InitializeFramework (void) { com::sun::star::uno::Reference<com::sun::star::frame::XController> diff --git a/sd/source/ui/view/SlideSorterViewShellBase.cxx b/sd/source/ui/view/SlideSorterViewShellBase.cxx index 74bfa2f45441..2257e13dc47d 100644 --- a/sd/source/ui/view/SlideSorterViewShellBase.cxx +++ b/sd/source/ui/view/SlideSorterViewShellBase.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "SlideSorterViewShellBase.hxx" #include "sdresid.hxx" #include "DrawDocShell.hxx" @@ -42,29 +41,17 @@ SfxViewShell* SlideSorterViewShellBase::CreateInstance ( return pBase; } - - - void SlideSorterViewShellBase::RegisterFactory( sal_uInt16 nPrio ) { pFactory = new SfxViewFactory(&CreateInstance,nPrio,"SlideSorter"); InitFactory(); } - - - void SlideSorterViewShellBase::InitFactory() { SFX_VIEW_REGISTRATION(DrawDocShell); } - - - - - - SlideSorterViewShellBase::SlideSorterViewShellBase ( SfxViewFrame* _pFrame, SfxViewShell* pOldShell) @@ -72,16 +59,10 @@ SlideSorterViewShellBase::SlideSorterViewShellBase ( { } - - - SlideSorterViewShellBase::~SlideSorterViewShellBase (void) { } - - - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index e8d196f26862..db255cb26e26 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ToolBarManager.hxx" #include "DrawViewShell.hxx" @@ -66,7 +65,6 @@ private: Reference<frame::XLayoutManager> mxLayouter; }; - typedef ::std::vector<OUString> NameList; /** Store a list of tool bars for each of the tool bar groups. From @@ -96,9 +94,6 @@ private: void MakeRequestedToolBarList (NameList& rToolBars) const; }; - - - /** Manage tool bars that are implemented as sub shells of a view shell. The typical procedure of updating the sub shells of a view shell is to rebuild a list of sub shells that the caller would like to have active. @@ -182,9 +177,6 @@ private: GroupedShellList maCurrentList; }; - - - /** This class concentrates the knowledge about when to show what tool bars in one place. */ @@ -236,9 +228,6 @@ private: } // end of anonymous namespace - - - namespace sd { //===== ToolBarManager::Implementation ======================================== @@ -343,8 +332,6 @@ private: DECL_LINK(SetValidCallback,void*); }; - - //===== ToolBarManager ======================================================== const OUString ToolBarManager::msToolBar("toolbar"); @@ -363,7 +350,6 @@ const OUString ToolBarManager::msGraphicObjectBar("graphicobjectbar"); const OUString ToolBarManager::msMediaObjectBar("mediaobjectbar"); const OUString ToolBarManager::msTableObjectBar("tableobjectbar"); - ::boost::shared_ptr<ToolBarManager> ToolBarManager::Create ( ViewShellBase& rBase, const ::boost::shared_ptr<sd::tools::EventMultiplexer>& rpMultiplexer, @@ -375,33 +361,21 @@ const OUString ToolBarManager::msTableObjectBar("tableobjectbar"); return pManager; } - - - ToolBarManager::ToolBarManager (void) : mpImpl() { } - - - ToolBarManager::~ToolBarManager (void) { } - - - void ToolBarManager::Shutdown (void) { if (mpImpl.get() != NULL) mpImpl.reset(); } - - - void ToolBarManager::ResetToolBars (ToolBarGroup eGroup) { if (mpImpl.get() != NULL) @@ -411,9 +385,6 @@ void ToolBarManager::ResetToolBars (ToolBarGroup eGroup) } } - - - void ToolBarManager::ResetAllToolBars (void) { if (mpImpl.get() != NULL) @@ -423,9 +394,6 @@ void ToolBarManager::ResetAllToolBars (void) } } - - - void ToolBarManager::AddToolBar ( ToolBarGroup eGroup, const OUString& rsToolBarName) @@ -437,9 +405,6 @@ void ToolBarManager::AddToolBar ( } } - - - void ToolBarManager::AddToolBarShell ( ToolBarGroup eGroup, ShellId nToolBarId) @@ -451,9 +416,6 @@ void ToolBarManager::AddToolBarShell ( } } - - - void ToolBarManager::RemoveToolBar ( ToolBarGroup eGroup, const OUString& rsToolBarName) @@ -465,9 +427,6 @@ void ToolBarManager::RemoveToolBar ( } } - - - void ToolBarManager::SetToolBar ( ToolBarGroup eGroup, const OUString& rsToolBarName) @@ -480,9 +439,6 @@ void ToolBarManager::SetToolBar ( } } - - - void ToolBarManager::SetToolBarShell ( ToolBarGroup eGroup, ShellId nToolBarId) @@ -495,54 +451,36 @@ void ToolBarManager::SetToolBarShell ( } } - - - void ToolBarManager::PreUpdate (void) { if (mpImpl.get()!=NULL) mpImpl->PreUpdate(); } - - - void ToolBarManager::RequestUpdate (void) { if (mpImpl.get()!=NULL) mpImpl->RequestUpdate(); } - - - void ToolBarManager::LockViewShellManager (void) { if (mpImpl.get() != NULL) mpImpl->LockViewShellManager(); } - - - void ToolBarManager::LockUpdate (void) { if (mpImpl.get()!=NULL) mpImpl->LockUpdate(); } - - - void ToolBarManager::UnlockUpdate (void) { if (mpImpl.get()!=NULL) mpImpl->UnlockUpdate(); } - - - void ToolBarManager::MainViewShellChanged (ViewShell::ShellType nShellType) { if (mpImpl.get() != NULL) @@ -552,9 +490,6 @@ void ToolBarManager::MainViewShellChanged (ViewShell::ShellType nShellType) } } - - - void ToolBarManager::MainViewShellChanged (const ViewShell& rMainViewShell) { if (mpImpl.get() != NULL) @@ -564,9 +499,6 @@ void ToolBarManager::MainViewShellChanged (const ViewShell& rMainViewShell) } } - - - void ToolBarManager::SelectionHasChanged ( const ViewShell& rViewShell, const SdrView& rView) @@ -575,14 +507,12 @@ void ToolBarManager::SelectionHasChanged ( mpImpl->GetToolBarRules().SelectionHasChanged(rViewShell,rView); } - void ToolBarManager::ToolBarsDestroyed(void) { if (mpImpl.get() != NULL) mpImpl->ToolBarsDestroyed(); } - //===== ToolBarManager::Implementation ======================================= const OUString ToolBarManager::Implementation::msToolBarResourcePrefix("private:resource/toolbar/"); @@ -617,8 +547,6 @@ ToolBarManager::Implementation::Implementation ( | tools::EventMultiplexerEvent::EID_PANE_MANAGER_DYING); } - - /** The order of statements is important. First unregister listeners, which may post user events. Then remove pending user events. @@ -636,13 +564,11 @@ ToolBarManager::Implementation::~Implementation (void) Application::RemoveUserEvent(mnPendingSetValidCall); } - void ToolBarManager::Implementation::ToolBarsDestroyed(void) { maToolBarList.MarkAllToolBarsAsNotActive(); } - void ToolBarManager::Implementation::SetValid (bool bValid) { ::osl::MutexGuard aGuard(maMutex); @@ -677,9 +603,6 @@ void ToolBarManager::Implementation::SetValid (bool bValid) } } - - - void ToolBarManager::Implementation::ResetToolBars (ToolBarGroup eGroup) { ::osl::MutexGuard aGuard(maMutex); @@ -690,9 +613,6 @@ void ToolBarManager::Implementation::ResetToolBars (ToolBarGroup eGroup) mbPreUpdatePending = true; } - - - void ToolBarManager::Implementation::ResetAllToolBars (void) { SAL_INFO("sd.view", OSL_THIS_FUNC << ": resetting all tool bars"); @@ -700,9 +620,6 @@ void ToolBarManager::Implementation::ResetAllToolBars (void) ResetToolBars((ToolBarGroup)i); } - - - void ToolBarManager::Implementation::AddToolBar ( ToolBarGroup eGroup, const OUString& rsToolBarName) @@ -719,9 +636,6 @@ void ToolBarManager::Implementation::AddToolBar ( } } - - - void ToolBarManager::Implementation::RemoveToolBar ( ToolBarGroup eGroup, const OUString& rsToolBarName) @@ -736,9 +650,6 @@ void ToolBarManager::Implementation::RemoveToolBar ( } } - - - void ToolBarManager::Implementation::AddToolBarShell ( ToolBarGroup eGroup, ShellId nToolBarId) @@ -751,18 +662,12 @@ void ToolBarManager::Implementation::AddToolBarShell ( } } - - - void ToolBarManager::Implementation::ReleaseAllToolBarShells (void) { maToolBarShellList.ReleaseAllShells(GetToolBarRules()); maToolBarShellList.UpdateShells(mrBase.GetMainViewShell(), mrBase.GetViewShellManager()); } - - - void ToolBarManager::Implementation::RequestUpdate (void) { if (mnPendingUpdateCall == 0) @@ -772,9 +677,6 @@ void ToolBarManager::Implementation::RequestUpdate (void) } } - - - void ToolBarManager::Implementation::PreUpdate (void) { ::osl::MutexGuard aGuard(maMutex); @@ -807,9 +709,6 @@ void ToolBarManager::Implementation::PreUpdate (void) } } - - - void ToolBarManager::Implementation::PostUpdate (void) { ::osl::MutexGuard aGuard(maMutex); @@ -841,9 +740,6 @@ void ToolBarManager::Implementation::PostUpdate (void) } } - - - void ToolBarManager::Implementation::LockViewShellManager (void) { if (mpViewShellManagerLock.get() == NULL) @@ -851,9 +747,6 @@ void ToolBarManager::Implementation::LockViewShellManager (void) new ViewShellManager::UpdateLock(mrBase.GetViewShellManager())); } - - - void ToolBarManager::Implementation::LockUpdate (void) { SAL_INFO("sd.view", OSL_THIS_FUNC << ": LockUpdate " << mnLockCount); @@ -869,9 +762,6 @@ void ToolBarManager::Implementation::LockUpdate (void) ++mnLockCount; } - - - void ToolBarManager::Implementation::UnlockUpdate (void) { SAL_INFO("sd.view", OSL_THIS_FUNC << ": UnlockUpdate " << mnLockCount); @@ -885,8 +775,6 @@ void ToolBarManager::Implementation::UnlockUpdate (void) } } - - SAL_WNODEPRECATED_DECLARATIONS_PUSH void ToolBarManager::Implementation::Update ( ::std::auto_ptr<LayouterLock> pLocalLayouterLock) @@ -965,13 +853,6 @@ void ToolBarManager::Implementation::Update ( } SAL_WNODEPRECATED_DECLARATIONS_POP - - - - - - - IMPL_LINK_NOARG(ToolBarManager::Implementation, UpdateCallback) { mnPendingUpdateCall = 0; @@ -987,9 +868,6 @@ IMPL_LINK_NOARG(ToolBarManager::Implementation, UpdateCallback) return 0; } - - - IMPL_LINK(ToolBarManager::Implementation,EventMultiplexerCallback, sd::tools::EventMultiplexerEvent*,pEvent) { @@ -1015,9 +893,6 @@ IMPL_LINK(ToolBarManager::Implementation,EventMultiplexerCallback, return 0; } - - - IMPL_LINK_NOARG(ToolBarManager::Implementation, SetValidCallback) { mnPendingSetValidCall = 0; @@ -1025,10 +900,6 @@ IMPL_LINK_NOARG(ToolBarManager::Implementation, SetValidCallback) return 0; } - - - - OUString ToolBarManager::Implementation::GetToolBarResourceName ( const OUString& rsBaseName) const { @@ -1037,9 +908,6 @@ OUString ToolBarManager::Implementation::GetToolBarResourceName ( return sToolBarName; } - - - bool ToolBarManager::Implementation::CheckPlugInMode (const OUString& rsName) const { bool bValid (false); @@ -1072,14 +940,8 @@ bool ToolBarManager::Implementation::CheckPlugInMode (const OUString& rsName) co return bValid; } - - - } // end of namespace sd - - - namespace { using namespace ::sd; @@ -1094,9 +956,6 @@ LayouterLock::LayouterLock (const Reference<frame::XLayoutManager>& rxLayouter) mxLayouter->lock(); } - - - LayouterLock::~LayouterLock (void) { SAL_INFO("sd.view", OSL_THIS_FUNC << ": ~LayouterLock " << (mxLayouter.is() ? 1 :0)); @@ -1104,9 +963,6 @@ LayouterLock::~LayouterLock (void) mxLayouter->unlock(); } - - - //===== ToolBarRules ========================================================== ToolBarRules::ToolBarRules ( @@ -1117,9 +973,6 @@ ToolBarRules::ToolBarRules ( { } - - - void ToolBarRules::Update (ViewShellBase& rBase) { ViewShell* pMainViewShell = rBase.GetMainViewShell().get(); @@ -1133,9 +986,6 @@ void ToolBarRules::Update (ViewShellBase& rBase) MainViewShellChanged(ViewShell::ST_NONE); } - - - void ToolBarRules::MainViewShellChanged (ViewShell::ShellType nShellType) { ::sd::ToolBarManager::UpdateLock aToolBarManagerLock (mpToolBarManager); @@ -1205,9 +1055,6 @@ void ToolBarRules::MainViewShellChanged (ViewShell::ShellType nShellType) } } - - - void ToolBarRules::MainViewShellChanged (const ViewShell& rMainViewShell) { ::sd::ToolBarManager::UpdateLock aToolBarManagerLock (mpToolBarManager); @@ -1235,9 +1082,6 @@ void ToolBarRules::MainViewShellChanged (const ViewShell& rMainViewShell) } } - - - void ToolBarRules::SelectionHasChanged ( const ::sd::ViewShell& rViewShell, const SdrView& rView) @@ -1303,9 +1147,6 @@ void ToolBarRules::SelectionHasChanged ( mpToolBarManager->AddToolBarShell(ToolBarManager::TBG_FUNCTION, RID_BEZIER_TOOLBOX); } - - - void ToolBarRules::SubShellAdded ( ::sd::ToolBarManager::ToolBarGroup eGroup, sd::ShellId nShellId) @@ -1336,9 +1177,6 @@ void ToolBarRules::SubShellAdded ( } } - - - void ToolBarRules::SubShellRemoved ( ::sd::ToolBarManager::ToolBarGroup eGroup, sd::ShellId nShellId) @@ -1369,9 +1207,6 @@ void ToolBarRules::SubShellRemoved ( } } - - - //===== ToolBarList =========================================================== ToolBarList::ToolBarList (void) @@ -1380,9 +1215,6 @@ ToolBarList::ToolBarList (void) { } - - - void ToolBarList::ClearGroup (sd::ToolBarManager::ToolBarGroup eGroup) { Groups::iterator iGroup (maGroups.find(eGroup)); @@ -1395,9 +1227,6 @@ void ToolBarList::ClearGroup (sd::ToolBarManager::ToolBarGroup eGroup) } } - - - void ToolBarList::AddToolBar ( sd::ToolBarManager::ToolBarGroup eGroup, const OUString& rsName) @@ -1417,9 +1246,6 @@ void ToolBarList::AddToolBar ( } } - - - bool ToolBarList::RemoveToolBar ( sd::ToolBarManager::ToolBarGroup eGroup, const OUString& rsName) @@ -1438,9 +1264,6 @@ bool ToolBarList::RemoveToolBar ( return false; } - - - void ToolBarList::MakeRequestedToolBarList (NameList& rRequestedToolBars) const { for (int i=sd::ToolBarManager::TBG__FIRST; i<=sd::ToolBarManager::TBG__LAST; ++i) @@ -1455,9 +1278,6 @@ void ToolBarList::MakeRequestedToolBarList (NameList& rRequestedToolBars) const } } - - - void ToolBarList::GetToolBarsToActivate (NameList& rToolBars) const { NameList aRequestedToolBars; @@ -1474,9 +1294,6 @@ void ToolBarList::GetToolBarsToActivate (NameList& rToolBars) const } } - - - void ToolBarList::GetToolBarsToDeactivate (NameList& rToolBars) const { NameList aRequestedToolBars; @@ -1493,34 +1310,22 @@ void ToolBarList::GetToolBarsToDeactivate (NameList& rToolBars) const } } - - - void ToolBarList::MarkToolBarAsActive (const OUString& rsName) { maActiveToolBars.push_back(rsName); } - - - void ToolBarList::MarkToolBarAsNotActive (const OUString& rsName) { maActiveToolBars.erase( ::std::find(maActiveToolBars.begin(),maActiveToolBars.end(), rsName)); } - - - void ToolBarList::MarkAllToolBarsAsNotActive (void) { maActiveToolBars.clear(); } - - - //===== ToolBarShellList ====================================================== ToolBarShellList::ShellDescriptor::ShellDescriptor ( @@ -1531,18 +1336,12 @@ ToolBarShellList::ShellDescriptor::ShellDescriptor ( { } - - - ToolBarShellList::ToolBarShellList (void) : maNewList() , maCurrentList() { } - - - void ToolBarShellList::ClearGroup (sd::ToolBarManager::ToolBarGroup eGroup) { // In every loop we erase the first member of the specified group. @@ -1569,9 +1368,6 @@ void ToolBarShellList::ClearGroup (sd::ToolBarManager::ToolBarGroup eGroup) while (bLoop); } - - - void ToolBarShellList::AddShellId (sd::ToolBarManager::ToolBarGroup eGroup, sd::ShellId nId) { // Make sure that the shell is not added twice (and possibly in @@ -1595,9 +1391,6 @@ void ToolBarShellList::AddShellId (sd::ToolBarManager::ToolBarGroup eGroup, sd:: maNewList.insert(aDescriptor); } - - - void ToolBarShellList::ReleaseAllShells (ToolBarRules& rRules) { // Release the currently active tool bars. @@ -1612,9 +1405,6 @@ void ToolBarShellList::ReleaseAllShells (ToolBarRules& rRules) maNewList.clear(); } - - - void ToolBarShellList::UpdateShells ( const ::boost::shared_ptr<ViewShell>& rpMainViewShell, const ::boost::shared_ptr<ViewShellManager>& rpManager) @@ -1652,9 +1442,6 @@ void ToolBarShellList::UpdateShells ( } } - - - } // end of anonymous namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/view/ViewClipboard.cxx b/sd/source/ui/view/ViewClipboard.cxx index 38af3dd9eecf..2f6554ccbfd4 100644 --- a/sd/source/ui/view/ViewClipboard.cxx +++ b/sd/source/ui/view/ViewClipboard.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ViewClipboard.hxx" #include "DrawDocShell.hxx" @@ -42,16 +41,10 @@ ViewClipboard::ViewClipboard (::sd::View& rView) { } - - - ViewClipboard::~ViewClipboard (void) { } - - - void ViewClipboard::HandlePageDrop (const SdTransferable& rTransferable) { // Determine whether to insert the given set of slides or to assign a @@ -63,9 +56,6 @@ void ViewClipboard::HandlePageDrop (const SdTransferable& rTransferable) InsertSlides (rTransferable, DetermineInsertPosition (rTransferable)); } - - - SdPage* ViewClipboard::GetFirstMasterPage (const SdTransferable& rTransferable) { SdPage* pFirstMasterPage = NULL; @@ -120,9 +110,6 @@ SdPage* ViewClipboard::GetFirstMasterPage (const SdTransferable& rTransferable) return pFirstMasterPage; } - - - void ViewClipboard::AssignMasterPage ( const SdTransferable& rTransferable, SdPage* pMasterPage) @@ -169,9 +156,6 @@ void ViewClipboard::AssignMasterPage ( ); } - - - sal_uInt16 ViewClipboard::DetermineInsertPosition ( const SdTransferable& ) { @@ -192,9 +176,6 @@ sal_uInt16 ViewClipboard::DetermineInsertPosition ( return nInsertPos; } - - - sal_uInt16 ViewClipboard::InsertSlides ( const SdTransferable& rTransferable, sal_uInt16 nInsertPosition) @@ -254,7 +235,6 @@ sal_uInt16 ViewClipboard::InsertSlides ( return nInsertPgCnt; } - } // end of namespace ::sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index a75d9d76b20b..00d1b7afa3dd 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -108,7 +108,6 @@ private: } // end of anonymous namespace - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; @@ -195,7 +194,6 @@ private: ::boost::shared_ptr<slidesorter::cache::PageCacheManager> mpPageCacheManager; }; - namespace { /** The only task of this window is to forward key presses to the content window of the main view shell. With the key press it forwards the focus @@ -260,9 +258,6 @@ ViewShellBase::ViewShellBase ( _pFrame->GetWindow().Hide(); } - - - /** In this destructor the order in which some of the members are destroyed (and/or being prepared to being destroyed) is important. Change it only when you know what you are doing. @@ -292,9 +287,6 @@ ViewShellBase::~ViewShellBase (void) SetWindow(NULL); } - - - void ViewShellBase::LateInit (const OUString& rsDefaultView) { StartListening(*GetViewFrame(),true); @@ -368,17 +360,11 @@ void ViewShellBase::LateInit (const OUString& rsDefaultView) } } - - - ::boost::shared_ptr<ViewShellManager> ViewShellBase::GetViewShellManager (void) const { return mpImpl->mpViewShellManager; } - - - ::boost::shared_ptr<ViewShell> ViewShellBase::GetMainViewShell (void) const { ::boost::shared_ptr<ViewShell> pMainViewShell ( @@ -390,9 +376,6 @@ void ViewShellBase::LateInit (const OUString& rsDefaultView) return pMainViewShell; } - - - ViewShellBase* ViewShellBase::GetViewShellBase (SfxViewFrame* pViewFrame) { ViewShellBase* pBase = NULL; @@ -409,16 +392,6 @@ ViewShellBase* ViewShellBase::GetViewShellBase (SfxViewFrame* pViewFrame) return pBase; } - - - - - - - - - - void ViewShellBase::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) { SfxViewShell::Notify(rBC, rHint); @@ -444,14 +417,10 @@ void ViewShellBase::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) } } - - - void ViewShellBase::InitializeFramework (void) { } - OUString ViewShellBase::GetSelectionText(bool bCompleteWords) { ::boost::shared_ptr<ViewShell> const pMainShell(GetMainViewShell()); @@ -490,17 +459,11 @@ void ViewShellBase::InnerResizePixel (const Point& rOrigin, const Size &rSize) mpImpl->ResizePixel(rOrigin, rSize, false); } - - - void ViewShellBase::OuterResizePixel (const Point& rOrigin, const Size &rSize) { mpImpl->ResizePixel (rOrigin, rSize, true); } - - - void ViewShellBase::Rearrange (void) { OSL_ASSERT(GetViewFrame()!=NULL); @@ -522,9 +485,6 @@ void ViewShellBase::Rearrange (void) GetViewFrame()->Resize(true); } - - - ErrCode ViewShellBase::DoVerb (long nVerb) { ErrCode aResult = ERRCODE_NONE; @@ -536,9 +496,6 @@ ErrCode ViewShellBase::DoVerb (long nVerb) return aResult; } - - - Reference<view::XRenderable> ViewShellBase::GetRenderable (void) { // Create a new DocumentRenderer on every call. It observes the life @@ -546,9 +503,6 @@ Reference<view::XRenderable> ViewShellBase::GetRenderable (void) return Reference<view::XRenderable>(new DocumentRenderer(*this)); } - - - SfxPrinter* ViewShellBase::GetPrinter (bool bCreate) { OSL_ASSERT(mpImpl.get()!=NULL); @@ -556,9 +510,6 @@ SfxPrinter* ViewShellBase::GetPrinter (bool bCreate) return GetDocShell()->GetPrinter (bCreate); } - - - sal_uInt16 ViewShellBase::SetPrinter ( SfxPrinter* pNewPrinter, sal_uInt16 nDiffFlags, @@ -609,9 +560,6 @@ sal_uInt16 ViewShellBase::SetPrinter ( return 0; } - - - void ViewShellBase::UIActivating( SfxInPlaceClient* pClient ) { mpImpl->ShowViewTabBar(false); @@ -623,9 +571,6 @@ void ViewShellBase::UIActivating( SfxInPlaceClient* pClient ) SfxViewShell::UIActivating( pClient ); } - - - void ViewShellBase::UIDeactivated( SfxInPlaceClient* pClient ) { SfxViewShell::UIDeactivated( pClient ); @@ -637,9 +582,6 @@ void ViewShellBase::UIDeactivated( SfxInPlaceClient* pClient ) pViewShell->UIDeactivated( pClient ); } - - - SvBorder ViewShellBase::GetBorder (bool ) { int nTop = 0; @@ -648,9 +590,6 @@ SvBorder ViewShellBase::GetBorder (bool ) return SvBorder(0,nTop,0,0); } - - - void ViewShellBase::Execute (SfxRequest& rRequest) { sal_uInt16 nSlotId = rRequest.GetSlot(); @@ -709,9 +648,6 @@ void ViewShellBase::Execute (SfxRequest& rRequest) } } - - - void ViewShellBase::GetState (SfxItemSet& rSet) { mpImpl->GetSlotState(rSet); @@ -719,9 +655,6 @@ void ViewShellBase::GetState (SfxItemSet& rSet) FuBullet::GetSlotState( rSet, 0, GetViewFrame() ); } - - - void ViewShellBase::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rSequence, @@ -733,9 +666,6 @@ void ViewShellBase::WriteUserDataSequence ( pShell->WriteUserDataSequence (rSequence, bBrowse); } - - - void ViewShellBase::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rSequence, @@ -783,9 +713,6 @@ void ViewShellBase::ReadUserDataSequence ( } } - - - void ViewShellBase::Activate (bool bIsMDIActivate) { SfxViewShell::Activate(bIsMDIActivate); @@ -801,17 +728,11 @@ void ViewShellBase::Activate (bool bIsMDIActivate) GetToolBarManager()->RequestUpdate(); } - - - void ViewShellBase::Deactivate (bool bIsMDIActivate) { SfxViewShell::Deactivate(bIsMDIActivate); } - - - void ViewShellBase::SetZoomFactor ( const Fraction &rZoomX, const Fraction &rZoomY) @@ -823,9 +744,6 @@ void ViewShellBase::SetZoomFactor ( pShell->SetZoomFactor (rZoomX, rZoomY); } - - - bool ViewShellBase::PrepareClose (bool bUI) { bool nResult = SfxViewShell::PrepareClose (bUI); @@ -843,9 +761,6 @@ bool ViewShellBase::PrepareClose (bool bUI) return nResult; } - - - void ViewShellBase::WriteUserData (OUString& rString, bool bBrowse) { SfxViewShell::WriteUserData (rString, bBrowse); @@ -856,9 +771,6 @@ void ViewShellBase::WriteUserData (OUString& rString, bool bBrowse) pShell->WriteUserData (rString); } - - - void ViewShellBase::ReadUserData (const OUString& rString, bool bBrowse) { SfxViewShell::ReadUserData (rString, bBrowse); @@ -869,9 +781,6 @@ void ViewShellBase::ReadUserData (const OUString& rString, bool bBrowse) pShell->ReadUserData (rString); } - - - SdrView* ViewShellBase::GetDrawView (void) const { // Forward call to main sub shell. @@ -882,26 +791,17 @@ SdrView* ViewShellBase::GetDrawView (void) const return SfxViewShell::GetDrawView(); } - - - void ViewShellBase::AdjustPosSizePixel (const Point &rOfs, const Size &rSize) { SfxViewShell::AdjustPosSizePixel (rOfs, rSize); } - - - void ViewShellBase::SetBusyState (bool bBusy) { if (GetDocShell() != NULL) GetDocShell()->SetWaitCursor (bBusy); } - - - void ViewShellBase::UpdateBorder ( bool bForce /* = false */ ) { // The following calls to SetBorderPixel() and InvalidateBorder() are @@ -926,9 +826,6 @@ void ViewShellBase::UpdateBorder ( bool bForce /* = false */ ) } } - - - void ViewShellBase::ShowUIControls (bool bVisible) { if (mpImpl->mpViewTabBar.is()) @@ -943,9 +840,6 @@ void ViewShellBase::ShowUIControls (bool bVisible) Rearrange(); } - - - OUString ViewShellBase::GetInitialViewShellType (void) { OUString sRequestedView (FrameworkHelper::msImpressViewURL); @@ -1009,9 +903,6 @@ OUString ViewShellBase::GetInitialViewShellType (void) return sRequestedView; } - - - /** this method starts the presentation by executing the slot SID_PRESENTATION asynchronous */ void ViewShellBase::StartPresentation() @@ -1020,10 +911,6 @@ void ViewShellBase::StartPresentation() GetViewFrame()->GetDispatcher()->Execute(SID_PRESENTATION, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD ); } - - - - ::boost::shared_ptr<tools::EventMultiplexer> ViewShellBase::GetEventMultiplexer (void) { OSL_ASSERT(mpImpl.get()!=NULL); @@ -1032,15 +919,11 @@ void ViewShellBase::StartPresentation() return mpImpl->mpEventMultiplexer; } - - - const Rectangle& ViewShellBase::getClientRectangle (void) const { return mpImpl->maClientArea; } - ::boost::shared_ptr<ToolBarManager> ViewShellBase::GetToolBarManager (void) const { OSL_ASSERT(mpImpl.get()!=NULL); @@ -1049,9 +932,6 @@ const Rectangle& ViewShellBase::getClientRectangle (void) const return mpImpl->mpToolBarManager; } - - - ::boost::shared_ptr<FormShellManager> ViewShellBase::GetFormShellManager (void) const { OSL_ASSERT(mpImpl.get()!=NULL); @@ -1060,9 +940,6 @@ const Rectangle& ViewShellBase::getClientRectangle (void) const return mpImpl->mpFormShellManager; } - - - DrawController& ViewShellBase::GetDrawController (void) const { OSL_ASSERT(mpImpl.get()!=NULL); @@ -1070,9 +947,6 @@ DrawController& ViewShellBase::GetDrawController (void) const return *mpImpl->mpController; } - - - void ViewShellBase::SetViewTabBar (const ::rtl::Reference<ViewTabBar>& rViewTabBar) { OSL_ASSERT(mpImpl.get()!=NULL); @@ -1080,9 +954,6 @@ void ViewShellBase::SetViewTabBar (const ::rtl::Reference<ViewTabBar>& rViewTabB mpImpl->mpViewTabBar = rViewTabBar; } - - - ::Window* ViewShellBase::GetViewWindow (void) { OSL_ASSERT(mpImpl.get()!=NULL); @@ -1090,7 +961,6 @@ void ViewShellBase::SetViewTabBar (const ::rtl::Reference<ViewTabBar>& rViewTabB return mpImpl->mpViewWindow.get(); } - OUString ImplRetrieveLabelFromCommand( const Reference< XFrame >& xFrame, const OUString& aCmdURL ) { OUString aLabel; @@ -1135,8 +1005,6 @@ OUString ViewShellBase::RetrieveLabelFromCommand( const OUString& aCmdURL ) cons return ImplRetrieveLabelFromCommand( xFrame, aCmdURL ); } - - //===== ViewShellBase::Implementation ========================================= ViewShellBase::Implementation::Implementation (ViewShellBase& rBase) @@ -1154,9 +1022,6 @@ ViewShellBase::Implementation::Implementation (ViewShellBase& rBase) { } - - - ViewShellBase::Implementation::~Implementation (void) { mpController = NULL; @@ -1165,17 +1030,11 @@ ViewShellBase::Implementation::~Implementation (void) mpToolBarManager.reset(); } - - - void ViewShellBase::Implementation::LateInit (void) { mpController = new DrawController(mrBase); } - - - void ViewShellBase::Implementation::ProcessRestoreEditingViewSlot (void) { ViewShell* pViewShell = mrBase.GetMainViewShell().get(); @@ -1199,9 +1058,6 @@ void ViewShellBase::Implementation::ProcessRestoreEditingViewSlot (void) } } - - - void ViewShellBase::Implementation::ShowViewTabBar (bool bShow) { if (mpViewTabBar.is() @@ -1212,9 +1068,6 @@ void ViewShellBase::Implementation::ShowViewTabBar (bool bShow) } } - - - void ViewShellBase::Implementation::ResizePixel ( const Point& rOrigin, const Size &rSize, @@ -1263,9 +1116,6 @@ void ViewShellBase::Implementation::ResizePixel ( maClientArea = Rectangle(Point(0,0), aViewWindowSize); } - - - void ViewShellBase::Implementation::SetPaneVisibility ( const SfxRequest& rRequest, const OUString& rsPaneURL, @@ -1328,10 +1178,6 @@ void ViewShellBase::Implementation::SetPaneVisibility ( } } - - - - void ViewShellBase::Implementation::GetSlotState (SfxItemSet& rSet) { try @@ -1460,13 +1306,8 @@ void ViewShellBase::Implementation::GetSlotState (SfxItemSet& rSet) } - - } // end of namespace sd - - - //===== CurrentPageSetter =========================================== namespace { @@ -1476,10 +1317,6 @@ CurrentPageSetter::CurrentPageSetter (ViewShellBase& rBase) { } - - - - void CurrentPageSetter::operator() (bool) { FrameView* pFrameView = NULL; @@ -1532,9 +1369,6 @@ void CurrentPageSetter::operator() (bool) } // end of anonymouse namespace - - - //===== FocusForwardingWindow ================================================= namespace sd { namespace { @@ -1548,17 +1382,11 @@ FocusForwardingWindow::FocusForwardingWindow ( OSL_TRACE("created FocusForwardingWindow at %x", this); } - - - FocusForwardingWindow::~FocusForwardingWindow (void) { OSL_TRACE("destroyed FocusForwardingWindow at %x", this); } - - - void FocusForwardingWindow::KeyInput (const KeyEvent& rKEvt) { ::boost::shared_ptr<ViewShell> pViewShell = mrBase.GetMainViewShell(); @@ -1576,9 +1404,6 @@ void FocusForwardingWindow::KeyInput (const KeyEvent& rKEvt) } } - - - void FocusForwardingWindow::Command (const CommandEvent& rEvent) { ::boost::shared_ptr<ViewShell> pViewShell = mrBase.GetMainViewShell(); @@ -1592,7 +1417,6 @@ void FocusForwardingWindow::Command (const CommandEvent& rEvent) } } - } // end of anonymouse namespace } // end of namespace sd diff --git a/sd/source/ui/view/ViewShellHint.cxx b/sd/source/ui/view/ViewShellHint.cxx index 130152a85376..900657b2b361 100644 --- a/sd/source/ui/view/ViewShellHint.cxx +++ b/sd/source/ui/view/ViewShellHint.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ViewShellHint.hxx" namespace sd { @@ -30,11 +29,6 @@ ViewShellHint::ViewShellHint (HintId eHintId) { } - - - - - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index f1111833cf22..7fb2f2e05a05 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ViewShellImplementation.hxx" #include "sdpage.hxx" @@ -72,9 +71,6 @@ ViewShell::Implementation::Implementation (ViewShell& rViewShell) { } - - - ViewShell::Implementation::~Implementation (void) { if ( ! mpUpdateLockForMouse.expired()) @@ -89,9 +85,6 @@ ViewShell::Implementation::~Implementation (void) } } - - - void ViewShell::Implementation::ProcessModifyPageSlot ( SfxRequest& rRequest, SdPage* pCurrentPage, @@ -286,9 +279,6 @@ void ViewShell::Implementation::AssignLayout ( SfxRequest& rRequest, PageKind eP } } - - - sal_uInt16 ViewShell::Implementation::GetViewId (void) { switch (mrViewShell.GetShellType()) @@ -320,9 +310,6 @@ sal_uInt16 ViewShell::Implementation::GetViewId (void) } } - - - SvxIMapDlg* ViewShell::Implementation::GetImageMapDialog (void) { SvxIMapDlg* pDialog = NULL; @@ -333,8 +320,6 @@ SvxIMapDlg* ViewShell::Implementation::GetImageMapDialog (void) return pDialog; } - - //===== ToolBarManagerLock ==================================================== class ViewShell::Implementation::ToolBarManagerLock::Deleter { public: @@ -352,9 +337,6 @@ class ViewShell::Implementation::ToolBarManagerLock::Deleter { public: return pLock; } - - - ViewShell::Implementation::ToolBarManagerLock::ToolBarManagerLock ( const ::boost::shared_ptr<ToolBarManager>& rpManager) : mpLock(new ToolBarManager::UpdateLock(rpManager)), @@ -367,9 +349,6 @@ ViewShell::Implementation::ToolBarManagerLock::ToolBarManagerLock ( maTimer.Start(); } - - - IMPL_LINK_NOARG(ViewShell::Implementation::ToolBarManagerLock, TimeoutCallback) { // If possible then release the lock now. Otherwise start the timer @@ -385,9 +364,6 @@ IMPL_LINK_NOARG(ViewShell::Implementation::ToolBarManagerLock, TimeoutCallback) return 0; } - - - void ViewShell::Implementation::ToolBarManagerLock::Release (bool bForce) { // If possible then release the lock now. Otherwise try again when the @@ -398,9 +374,6 @@ void ViewShell::Implementation::ToolBarManagerLock::Release (bool bForce) } } - - - ViewShell::Implementation::ToolBarManagerLock::~ToolBarManagerLock (void) { mpLock.reset(); diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx index 3be7dd0f4d83..f52e89bb5776 100644 --- a/sd/source/ui/view/ViewShellManager.cxx +++ b/sd/source/ui/view/ViewShellManager.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ViewShellManager.hxx" #include "ViewShell.hxx" #include "ViewShellBase.hxx" @@ -63,9 +62,6 @@ public: ::Window* GetWindow (void) const; }; - - - /** This functor can be used to search for a shell in an STL container when the shell pointer is given. */ @@ -79,9 +75,6 @@ private: const SfxShell* mpShell; }; - - - /** This functor can be used to search for a shell in an STL container when the id of the shell is given. */ @@ -97,9 +90,6 @@ private: } // end of anonymous namespace - - - class ViewShellManager::Implementation { public: @@ -143,8 +133,6 @@ public: Implementation& mrImpl; }; - - /** Prevent updates of the shell stack. While the sub shell manager is locked it will update its internal data structures but not alter the shell stack. Use this method when there are several modifications @@ -238,9 +226,6 @@ private: const ShellDescriptor& rDescriptor); }; - - - //===== ViewShellManager ====================================================== ViewShellManager::ViewShellManager (ViewShellBase& rBase) @@ -249,16 +234,10 @@ ViewShellManager::ViewShellManager (ViewShellBase& rBase) { } - - - ViewShellManager::~ViewShellManager (void) { } - - - void ViewShellManager::AddSubShellFactory ( ViewShell* pViewShell, const SharedShellFactory& rpFactory) @@ -267,9 +246,6 @@ void ViewShellManager::AddSubShellFactory ( mpImpl->AddShellFactory(pViewShell, rpFactory); } - - - void ViewShellManager::RemoveSubShellFactory ( ViewShell* pViewShell, const SharedShellFactory& rpFactory) @@ -278,27 +254,18 @@ void ViewShellManager::RemoveSubShellFactory ( mpImpl->RemoveShellFactory(pViewShell, rpFactory); } - - - void ViewShellManager::ActivateViewShell (ViewShell* pViewShell) { if (mbValid) return mpImpl->ActivateViewShell(pViewShell); } - - - void ViewShellManager::DeactivateViewShell (const ViewShell* pShell) { if (mbValid && pShell!=NULL) mpImpl->DeactivateViewShell(*pShell); } - - - void ViewShellManager::SetFormShell ( const ViewShell* pParentShell, FmFormShell* pFormShell, @@ -308,63 +275,42 @@ void ViewShellManager::SetFormShell ( mpImpl->SetFormShell(pParentShell,pFormShell,bAbove); } - - - void ViewShellManager::ActivateSubShell (const ViewShell& rViewShell, ShellId nId) { if (mbValid) mpImpl->ActivateSubShell(rViewShell,nId); } - - - void ViewShellManager::DeactivateSubShell (const ViewShell& rViewShell, ShellId nId) { if (mbValid) mpImpl->DeactivateSubShell(rViewShell,nId); } - - - void ViewShellManager::InvalidateAllSubShells (ViewShell* pViewShell) { if (mbValid) mpImpl->InvalidateAllSubShells(pViewShell); } - - - void ViewShellManager::ActivateShell (SfxShell* pShell) { if (mbValid && pShell!=NULL) mpImpl->ActivateShell(*pShell); } - - - void ViewShellManager::DeactivateShell (const SfxShell* pShell) { if (mbValid && pShell!=NULL) mpImpl->DeactivateShell(*pShell); } - - - void ViewShellManager::MoveToTop (const ViewShell& rParentShell) { if (mbValid) mpImpl->MoveToTop(rParentShell); } - - - SfxShell* ViewShellManager::GetShell (ShellId nId) const { if (mbValid) @@ -373,9 +319,6 @@ SfxShell* ViewShellManager::GetShell (ShellId nId) const return NULL; } - - - SfxShell* ViewShellManager::GetTopShell (void) const { if (mbValid) @@ -384,9 +327,6 @@ SfxShell* ViewShellManager::GetTopShell (void) const return NULL; } - - - void ViewShellManager::Shutdown (void) { if (mbValid) @@ -396,24 +336,16 @@ void ViewShellManager::Shutdown (void) } } - - void ViewShellManager::LockUpdate (void) { mpImpl->LockUpdate(); } - - - void ViewShellManager::UnlockUpdate (void) { mpImpl->UnlockUpdate(); } - - - //===== ViewShellManager::Implementation ====================================== ViewShellManager::Implementation::Implementation ( @@ -434,17 +366,11 @@ ViewShellManager::Implementation::Implementation ( (void)rManager; } - - - ViewShellManager::Implementation::~Implementation (void) { Shutdown(); } - - - void ViewShellManager::Implementation::AddShellFactory ( const SfxShell* pViewShell, const SharedShellFactory& rpFactory) @@ -466,9 +392,6 @@ void ViewShellManager::Implementation::AddShellFactory ( maShellFactories.insert(FactoryList::value_type(pViewShell, rpFactory)); } - - - void ViewShellManager::Implementation::RemoveShellFactory ( const SfxShell* pViewShell, const SharedShellFactory& rpFactory) @@ -483,9 +406,6 @@ void ViewShellManager::Implementation::RemoveShellFactory ( } } - - - void ViewShellManager::Implementation::ActivateViewShell (ViewShell* pViewShell) { ::osl::MutexGuard aGuard (maMutex); @@ -515,9 +435,6 @@ void ViewShellManager::Implementation::ActivateViewShell (ViewShell* pViewShell) ActivateShell(aResult); } - - - void ViewShellManager::Implementation::DeactivateViewShell (const ViewShell& rShell) { ::osl::MutexGuard aGuard (maMutex); @@ -548,9 +465,6 @@ void ViewShellManager::Implementation::DeactivateViewShell (const ViewShell& rSh } } - - - void ViewShellManager::Implementation::ActivateShell (SfxShell& rShell) { ::osl::MutexGuard aGuard (maMutex); @@ -562,9 +476,6 @@ void ViewShellManager::Implementation::ActivateShell (SfxShell& rShell) ActivateShell(aDescriptor); } - - - void ViewShellManager::Implementation::ActivateShell (const ShellDescriptor& rDescriptor) { // Put shell on top of the active view shells. @@ -589,9 +500,6 @@ void ViewShellManager::Implementation::ActivateShell (const ShellDescriptor& rDe } } - - - void ViewShellManager::Implementation::DeactivateShell (const SfxShell& rShell) { ::osl::MutexGuard aGuard (maMutex); @@ -622,9 +530,6 @@ void ViewShellManager::Implementation::DeactivateShell (const SfxShell& rShell) } } - - - void ViewShellManager::Implementation::ActivateSubShell ( const SfxShell& rParentShell, ShellId nId) @@ -657,9 +562,6 @@ void ViewShellManager::Implementation::ActivateSubShell ( rList.push_back(ShellDescriptor(NULL, nId)); } - - - void ViewShellManager::Implementation::DeactivateSubShell ( const SfxShell& rParentShell, ShellId nId) @@ -692,9 +594,6 @@ void ViewShellManager::Implementation::DeactivateSubShell ( DestroySubShell(rParentShell, aDescriptor); } - - - void ViewShellManager::Implementation::MoveToTop (const SfxShell& rShell) { ::osl::MutexGuard aGuard (maMutex); @@ -767,9 +666,6 @@ void ViewShellManager::Implementation::MoveToTop (const SfxShell& rShell) } } - - - SfxShell* ViewShellManager::Implementation::GetShell (ShellId nId) const { ::osl::MutexGuard aGuard (maMutex); @@ -804,26 +700,17 @@ SfxShell* ViewShellManager::Implementation::GetShell (ShellId nId) const return pShell; } - - - SfxShell* ViewShellManager::Implementation::GetTopShell (void) const { OSL_ASSERT(mpTopShell == mrBase.GetSubShell(0)); return mpTopShell; } - - - void ViewShellManager::Implementation::LockUpdate (void) { mnUpdateLockCount++; } - - - void ViewShellManager::Implementation::UnlockUpdate (void) { ::osl::MutexGuard aGuard (maMutex); @@ -839,9 +726,6 @@ void ViewShellManager::Implementation::UnlockUpdate (void) UpdateShellStack(); } - - - /** Update the SFX shell stack (the portion that is visible to us) so that it matches the internal shell stack. This is done in six steps: 1. Create the missing view shells and sub shells. @@ -865,12 +749,10 @@ void ViewShellManager::Implementation::UpdateShellStack (void) // 1. Create the missing shells. CreateShells(); - // 2. Create the internal target stack. ShellStack aTargetStack; CreateTargetStack(aTargetStack); - // 3. Get SFX shell stack. ShellStack aSfxShellStack; sal_uInt16 nIndex (0); @@ -880,7 +762,6 @@ void ViewShellManager::Implementation::UpdateShellStack (void) while (nIndex-- > 0) aSfxShellStack.push_back(mrBase.GetSubShell(nIndex)); - #if OSL_DEBUG_LEVEL >= 2 SAL_INFO("sd.view", OSL_THIS_FUNC << ": Current SFX Stack"); DumpShellStack(aSfxShellStack); @@ -888,7 +769,6 @@ void ViewShellManager::Implementation::UpdateShellStack (void) DumpShellStack(aTargetStack); #endif - // 4. Find the lowest shell in which the two stacks differ. ShellStack::iterator iSfxShell (aSfxShellStack.begin()); ShellStack::iterator iTargetShell (aTargetStack.begin()); @@ -900,7 +780,6 @@ void ViewShellManager::Implementation::UpdateShellStack (void) ++iTargetShell; } - // 5. Remove all shells above and including the differing shell from the // SFX stack starting with the shell on top of the stack. for (std::reverse_iterator<ShellStack::const_iterator> i(aSfxShellStack.end()), iLast(iSfxShell); @@ -912,7 +791,6 @@ void ViewShellManager::Implementation::UpdateShellStack (void) } aSfxShellStack.erase(iSfxShell, aSfxShellStack.end()); - // 6. Push shells from the given stack onto the SFX stack. mbShellStackIsUpToDate = false; while (iTargetShell != aTargetStack.end()) @@ -946,9 +824,6 @@ void ViewShellManager::Implementation::UpdateShellStack (void) #endif } - - - void ViewShellManager::Implementation::TakeShellsFromStack (const SfxShell* pShell) { ::osl::MutexGuard aGuard (maMutex); @@ -1013,16 +888,12 @@ void ViewShellManager::Implementation::TakeShellsFromStack (const SfxShell* pShe mpTopShell->SetUndoManager(pUndoManager); } - #if OSL_DEBUG_LEVEL >= 2 SAL_INFO("sd.view", OSL_THIS_FUNC << "Sfx shell stack is:"); DumpSfxShellStack(); #endif } - - - void ViewShellManager::Implementation::CreateShells (void) { ::osl::MutexGuard aGuard (maMutex); @@ -1050,9 +921,6 @@ void ViewShellManager::Implementation::CreateShells (void) } } - - - void ViewShellManager::Implementation::CreateTargetStack (ShellStack& rStack) const { // Create a local stack of the shells that are to push on the shell @@ -1094,9 +962,6 @@ void ViewShellManager::Implementation::CreateTargetStack (ShellStack& rStack) co } } - - - IMPL_LINK(ViewShellManager::Implementation, WindowEventHandler, VclWindowEvent*, pEvent) { if (pEvent != NULL) @@ -1145,9 +1010,6 @@ IMPL_LINK(ViewShellManager::Implementation, WindowEventHandler, VclWindowEvent*, return sal_True; } - - - ShellDescriptor ViewShellManager::Implementation::CreateSubShell ( SfxShell* pParentShell, ShellId nShellId, @@ -1180,9 +1042,6 @@ ShellDescriptor ViewShellManager::Implementation::CreateSubShell ( return aResult; } - - - void ViewShellManager::Implementation::DestroyViewShell ( ShellDescriptor& rDescriptor) { @@ -1210,9 +1069,6 @@ void ViewShellManager::Implementation::DestroyViewShell ( rDescriptor.mpFactory->ReleaseShell(rDescriptor.mpShell); } - - - void ViewShellManager::Implementation::DestroySubShell ( const SfxShell& rParentShell, const ShellDescriptor& rDescriptor) @@ -1222,9 +1078,6 @@ void ViewShellManager::Implementation::DestroySubShell ( rDescriptor.mpFactory->ReleaseShell(rDescriptor.mpShell); } - - - void ViewShellManager::Implementation::InvalidateAllSubShells (const SfxShell* pParentShell) { ::osl::MutexGuard aGuard (maMutex); @@ -1240,9 +1093,6 @@ void ViewShellManager::Implementation::InvalidateAllSubShells (const SfxShell* p } } - - - void ViewShellManager::Implementation::Shutdown (void) { ::osl::MutexGuard aGuard (maMutex); @@ -1252,7 +1102,6 @@ void ViewShellManager::Implementation::Shutdown (void) { UpdateLock aLock (*this); - while ( ! maActiveViewShells.empty()) { SfxShell* pShell = maActiveViewShells.front().mpShell; @@ -1277,9 +1126,6 @@ void ViewShellManager::Implementation::Shutdown (void) maShellFactories.clear(); } - - - #if OSL_DEBUG_LEVEL >= 2 void ViewShellManager::Implementation::DumpShellStack (const ShellStack& rStack) { @@ -1293,9 +1139,6 @@ void ViewShellManager::Implementation::DumpShellStack (const ShellStack& rStack) SAL_INFO("sd.view", OSL_THIS_FUNC << " null"); } - - - void ViewShellManager::Implementation::DumpSfxShellStack (void) { ShellStack aSfxShellStack; @@ -1309,8 +1152,6 @@ void ViewShellManager::Implementation::DumpSfxShellStack (void) } #endif - - void ViewShellManager::Implementation::Deactivate (SfxShell* pShell) { OSL_ASSERT(pShell!=NULL); @@ -1335,9 +1176,6 @@ void ViewShellManager::Implementation::Deactivate (SfxShell* pShell) pShell->Deactivate(true); } - - - void ViewShellManager::Implementation::SetFormShell ( const ViewShell* pFormShellParent, FmFormShell* pFormShell, @@ -1350,9 +1188,6 @@ void ViewShellManager::Implementation::SetFormShell ( mbFormShellAboveParent = bFormShellAboveParent; } - - - namespace { ShellDescriptor::ShellDescriptor (void) @@ -1363,9 +1198,6 @@ ShellDescriptor::ShellDescriptor (void) { } - - - ShellDescriptor::ShellDescriptor ( SfxShell* pShell, ShellId nId) @@ -1376,9 +1208,6 @@ ShellDescriptor::ShellDescriptor ( { } - - - ShellDescriptor::ShellDescriptor (const ShellDescriptor& rDescriptor) : mpShell(rDescriptor.mpShell), mnId(rDescriptor.mnId), @@ -1387,9 +1216,6 @@ ShellDescriptor::ShellDescriptor (const ShellDescriptor& rDescriptor) { } - - - ShellDescriptor& ShellDescriptor::operator= (const ShellDescriptor& rDescriptor) { if (this != &rDescriptor) @@ -1402,9 +1228,6 @@ ShellDescriptor& ShellDescriptor::operator= (const ShellDescriptor& rDescriptor) return *this; } - - - bool ShellDescriptor::IsMainViewShell (void) const { ViewShell* pViewShell = dynamic_cast<ViewShell*>(mpShell); @@ -1414,9 +1237,6 @@ bool ShellDescriptor::IsMainViewShell (void) const return false; } - - - ::Window* ShellDescriptor::GetWindow (void) const { ViewShell* pViewShell = dynamic_cast<ViewShell*>(mpShell); @@ -1426,8 +1246,6 @@ bool ShellDescriptor::IsMainViewShell (void) const return NULL; } - - } // end of anonymous namespace } // end of namespace sd diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx index 45f728ced453..01058ddcb4ec 100644 --- a/sd/source/ui/view/ViewTabBar.cxx +++ b/sd/source/ui/view/ViewTabBar.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ViewTabBar.hxx" #include "ViewShell.hxx" @@ -135,16 +134,10 @@ ViewTabBar::ViewTabBar ( } } - - - ViewTabBar::~ViewTabBar (void) { } - - - void ViewTabBar::disposing (void) { if (mpViewShellBase != NULL @@ -181,13 +174,6 @@ void ViewTabBar::disposing (void) mxController = NULL; } - - - - - - - ::Window* ViewTabBar::GetAnchorWindow( const Reference<XResourceId>& rxViewTabBarId, const Reference<frame::XController>& rxController) @@ -250,9 +236,6 @@ void ViewTabBar::disposing (void) return pWindow; } - - - //----- XConfigurationChangeListener ------------------------------------------ void SAL_CALL ViewTabBar::notifyConfigurationChange ( @@ -267,9 +250,6 @@ void SAL_CALL ViewTabBar::notifyConfigurationChange ( } } - - - //----- XEventListener -------------------------------------------------------- void SAL_CALL ViewTabBar::disposing( @@ -283,9 +263,6 @@ void SAL_CALL ViewTabBar::disposing( } } - - - //----- XTabBar --------------------------------------------------------------- void SAL_CALL ViewTabBar::addTabBarButtonAfter ( @@ -297,9 +274,6 @@ void SAL_CALL ViewTabBar::addTabBarButtonAfter ( AddTabBarButton(rButton, rAnchor); } - - - void SAL_CALL ViewTabBar::appendTabBarButton (const TabBarButton& rButton) throw (::com::sun::star::uno::RuntimeException, std::exception) { @@ -307,8 +281,6 @@ void SAL_CALL ViewTabBar::appendTabBarButton (const TabBarButton& rButton) AddTabBarButton(rButton); } - - void SAL_CALL ViewTabBar::removeTabBarButton (const TabBarButton& rButton) throw (::com::sun::star::uno::RuntimeException, std::exception) { @@ -316,9 +288,6 @@ void SAL_CALL ViewTabBar::removeTabBarButton (const TabBarButton& rButton) RemoveTabBarButton(rButton); } - - - sal_Bool SAL_CALL ViewTabBar::hasTabBarButton (const TabBarButton& rButton) throw (::com::sun::star::uno::RuntimeException, std::exception) { @@ -326,9 +295,6 @@ sal_Bool SAL_CALL ViewTabBar::hasTabBarButton (const TabBarButton& rButton) return HasTabBarButton(rButton); } - - - Sequence<TabBarButton> SAL_CALL ViewTabBar::getTabBarButtons (void) throw (::com::sun::star::uno::RuntimeException, std::exception) { @@ -336,9 +302,6 @@ Sequence<TabBarButton> SAL_CALL ViewTabBar::getTabBarButtons (void) return GetTabBarButtons(); } - - - //----- XResource ------------------------------------------------------------- Reference<XResourceId> SAL_CALL ViewTabBar::getResourceId (void) @@ -347,18 +310,12 @@ Reference<XResourceId> SAL_CALL ViewTabBar::getResourceId (void) return mxViewTabBarId; } - - - sal_Bool SAL_CALL ViewTabBar::isAnchorOnly (void) throw (RuntimeException, std::exception) { return false; } - - - //----- XUnoTunnel ------------------------------------------------------------ namespace @@ -385,11 +342,6 @@ sal_Int64 SAL_CALL ViewTabBar::getSomething (const Sequence<sal_Int8>& rId) return nResult; } - - - - - bool ViewTabBar::ActivatePage (void) { try @@ -443,9 +395,6 @@ bool ViewTabBar::ActivatePage (void) return false; } - - - int ViewTabBar::GetHeight (void) { int nHeight (0); @@ -467,9 +416,6 @@ int ViewTabBar::GetHeight (void) return nHeight; } - - - void ViewTabBar::AddTabBarButton ( const ::com::sun::star::drawing::framework::TabBarButton& rButton, const ::com::sun::star::drawing::framework::TabBarButton& rAnchor) @@ -497,18 +443,12 @@ void ViewTabBar::AddTabBarButton ( AddTabBarButton(rButton,nIndex); } - - - void ViewTabBar::AddTabBarButton ( const ::com::sun::star::drawing::framework::TabBarButton& rButton) { AddTabBarButton(rButton, maTabBarButtons.size()); } - - - void ViewTabBar::AddTabBarButton ( const ::com::sun::star::drawing::framework::TabBarButton& rButton, sal_Int32 nPosition) @@ -525,9 +465,6 @@ void ViewTabBar::AddTabBarButton ( } } - - - void ViewTabBar::RemoveTabBarButton ( const ::com::sun::star::drawing::framework::TabBarButton& rButton) { @@ -544,9 +481,6 @@ void ViewTabBar::RemoveTabBarButton ( } } - - - bool ViewTabBar::HasTabBarButton ( const ::com::sun::star::drawing::framework::TabBarButton& rButton) { @@ -564,9 +498,6 @@ bool ViewTabBar::HasTabBarButton ( return bResult; } - - - ::com::sun::star::uno::Sequence<com::sun::star::drawing::framework::TabBarButton> ViewTabBar::GetTabBarButtons (void) { @@ -580,9 +511,6 @@ bool ViewTabBar::HasTabBarButton ( return aList; } - - - void ViewTabBar::UpdateActiveButton (void) { Reference<XView> xView; @@ -604,9 +532,6 @@ void ViewTabBar::UpdateActiveButton (void) } } - - - void ViewTabBar::UpdateTabBarButtons (void) { TabBarButtonList::const_iterator iTab; @@ -631,9 +556,6 @@ void ViewTabBar::UpdateTabBarButtons (void) mpTabPage->Hide(); } - - - //===== TabBarControl ========================================================= TabBarControl::TabBarControl ( @@ -644,9 +566,6 @@ TabBarControl::TabBarControl ( { } - - - void TabBarControl::Paint (const Rectangle& rRect) { Color aOriginalFillColor (GetFillColor()); @@ -665,9 +584,6 @@ void TabBarControl::Paint (const Rectangle& rRect) SetLineColor (aOriginalLineColor); } - - - void TabBarControl::ActivatePage (void) { if (mpViewTabBar->ActivatePage()) diff --git a/sd/source/ui/view/WindowUpdater.cxx b/sd/source/ui/view/WindowUpdater.cxx index 869d53a3b485..391e1c33be36 100644 --- a/sd/source/ui/view/WindowUpdater.cxx +++ b/sd/source/ui/view/WindowUpdater.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "WindowUpdater.hxx" #include "ViewShell.hxx" #include "Window.hxx" @@ -40,17 +39,11 @@ WindowUpdater::WindowUpdater (void) maCTLOptions.AddListener(this); } - - - WindowUpdater::~WindowUpdater (void) throw () { maCTLOptions.RemoveListener(this); } - - - void WindowUpdater::RegisterWindow (::Window* pWindow) { if (pWindow != NULL) @@ -67,9 +60,6 @@ void WindowUpdater::RegisterWindow (::Window* pWindow) } } - - - void WindowUpdater::UnregisterWindow (::Window* pWindow) { tWindowList::iterator aWindowIterator ( @@ -81,24 +71,16 @@ void WindowUpdater::UnregisterWindow (::Window* pWindow) } } - - void WindowUpdater::SetViewShell (ViewShell& rViewShell) { mpViewShell = &rViewShell; } - - - void WindowUpdater::SetDocument (SdDrawDocument* pDocument) { mpDocument = pDocument; } - - - void WindowUpdater::Update ( OutputDevice* pDevice, SdDrawDocument* pDocument) const @@ -111,9 +93,6 @@ void WindowUpdater::Update ( } } - - - void WindowUpdater::UpdateWindow (OutputDevice* pDevice) const { if (pDevice != NULL) @@ -145,9 +124,6 @@ void WindowUpdater::UpdateWindow (OutputDevice* pDevice) const } } - - - void WindowUpdater::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) { // Set the current state at all registered output devices. @@ -165,7 +141,6 @@ void WindowUpdater::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uI (*aWindowIterator++)->Invalidate(); } - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/view/clview.cxx b/sd/source/ui/view/clview.cxx index a5cac3ed5bb0..cf0b5b1f0462 100644 --- a/sd/source/ui/view/clview.cxx +++ b/sd/source/ui/view/clview.cxx @@ -41,7 +41,6 @@ ClientView::ClientView( { } - ClientView::~ClientView() { } @@ -72,7 +71,6 @@ void ClientView::CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr:: DrawView::CompleteRedraw(pOutDev, rReg, pRedirector); } - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/view/drbezob.cxx b/sd/source/ui/view/drbezob.cxx index bf1b88631f94..e3a606bae0ea 100644 --- a/sd/source/ui/view/drbezob.cxx +++ b/sd/source/ui/view/drbezob.cxx @@ -45,7 +45,6 @@ #include "fusel.hxx" #include "fuconbez.hxx" - using namespace sd; #define BezierObjectBar #include "sdslots.hxx" @@ -79,13 +78,11 @@ BezierObjectBar::BezierObjectBar( SetHelpId( SD_IF_SDDRAWBEZIEROBJECTBAR ); } - BezierObjectBar::~BezierObjectBar() { SetRepeatTarget(NULL); } - /** * Status of attribute items. */ @@ -327,7 +324,6 @@ void BezierObjectBar::Execute(SfxRequest& rReq) Invalidate(); } - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx index 2e7fb1938e1d..4df5c0d2430f 100644 --- a/sd/source/ui/view/drtxtob.cxx +++ b/sd/source/ui/view/drtxtob.cxx @@ -119,7 +119,6 @@ TextObjectBar::TextObjectBar ( // SetHelpId( SD_IF_SDDRAWTEXTOBJECTBAR ); } - TextObjectBar::~TextObjectBar() { SetRepeatTarget(NULL); @@ -230,7 +229,6 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) } break; - case SID_STYLE_APPLY: case SID_STYLE_FAMILY2: { @@ -428,7 +426,6 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) rSet.Put( aAttrSet, false ); // <- sal_False, so DontCare-Status gets aquired - // these are disabled in outline-mode if (!mpViewShell || !mpViewShell->ISA(DrawViewShell)) { @@ -600,7 +597,6 @@ void TextObjectBar::Command( const CommandEvent& ) { } - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 5760ffb69bed..30d552625700 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "DrawViewShell.hxx" #include "ViewShellImplementation.hxx" @@ -113,7 +112,6 @@ void DrawViewShell::UIDeactivated( SfxInPlaceClient* pCli ) ViewShell::UIDeactivated(pCli); } - void DrawViewShell::Deactivate(bool bIsMDIActivate) { // Temporarily disable context broadcasting while the Deactivate() @@ -468,11 +466,6 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive) } } - - - - - /** * Generate horizontal ruler */ @@ -724,7 +717,6 @@ ErrCode DrawViewShell::DoVerb(long nVerb) return 0; } - /** * Activate OLE-object */ @@ -1101,7 +1093,6 @@ bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage) return (bOK); } - /** * Check if page change is allowed */ diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 4d4bd6a033da..c3c49d2af72f 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -1581,7 +1581,6 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) bool bOldIsLocked = bIsLocked = mpDrawView->IsLayerLocked(aLayerName); bool bOldIsPrintable = bIsPrintable = mpDrawView->IsLayerPrintable(aLayerName); - const SfxItemSet* pArgs = rReq.GetArgs(); // is it allowed to delete the layer? bool bDelete = true; diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 3b5af17c5962..d973def7da69 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "DrawViewShell.hxx" #include <sfx2/viewfrm.hxx> @@ -182,7 +181,6 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) break; } - if( GetDocSh() && (GetDocSh()->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED)) GetDocSh()->SetModified(); @@ -480,7 +478,6 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) } } - void DrawViewShell::ExecRuler(SfxRequest& rReq) { // nothing is executed during a slide show! @@ -853,7 +850,6 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq) AddUndoAction(pUndoGroup); } - void DrawViewShell::GetRulerState(SfxItemSet& rSet) { Point aOrigin; @@ -1008,7 +1004,6 @@ void DrawViewShell::GetRulerState(SfxItemSet& rSet) rSet.Put( aProtect ); } - void DrawViewShell::ExecStatusBar(SfxRequest& rReq) { // nothing is executed during a slide show! diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx index e01ed34c844e..dbe9323a7f33 100644 --- a/sd/source/ui/view/drviews4.cxx +++ b/sd/source/ui/view/drviews4.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> #include "DrawViewShell.hxx" @@ -40,7 +39,6 @@ #include <editeng/editview.hxx> #include <vcl/cursor.hxx> - #include "app.hrc" #include "glob.hrc" #include "strings.hrc" @@ -74,7 +72,6 @@ namespace sd { using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing; - void DrawViewShell::DeleteActualPage() { sal_uInt16 nPage = maTabControl.GetCurPageId() - 1; @@ -94,7 +91,6 @@ void DrawViewShell::DeleteActualPage() } } - void DrawViewShell::DeleteActualLayer() { if(!GetLayerTabControl()) // #i87182# @@ -124,8 +120,6 @@ void DrawViewShell::DeleteActualLayer() } } - - bool DrawViewShell::KeyInput (const KeyEvent& rKEvt, ::sd::Window* pWin) { bool bRet = false; @@ -299,8 +293,6 @@ void DrawViewShell::MouseButtonDown(const MouseEvent& rMEvt, } } - - void DrawViewShell::MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin) { if ( !IsInputLocked() ) @@ -408,8 +400,6 @@ void DrawViewShell::MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin) } } - - void DrawViewShell::MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin) { if ( !IsInputLocked() ) @@ -451,7 +441,6 @@ void DrawViewShell::MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin) } } - void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) { // The command event is send to the window after a possible context @@ -804,7 +793,6 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) } } - void DrawViewShell::ShowMousePosInfo(const Rectangle& rRect, ::sd::Window* pWin) { @@ -888,9 +876,6 @@ void DrawViewShell::UnlockInput() mnLockCount--; } - - - void DrawViewShell::ShowSnapLineContextMenu ( SdrPageView& rPageView, const sal_uInt16 nSnapLineIndex, diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx index d8a94dfd6c29..febbade12496 100644 --- a/sd/source/ui/view/drviews5.cxx +++ b/sd/source/ui/view/drviews5.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "DrawViewShell.hxx" #include "PresentationViewShell.hxx" #include <editeng/outliner.hxx> @@ -87,9 +86,6 @@ void DrawViewShell::ModelHasChanged() } } - - - void DrawViewShell::Resize (void) { ViewShell::Resize(); @@ -106,9 +102,6 @@ void DrawViewShell::Resize (void) } } - - - void DrawViewShell::ArrangeGUIElements (void) { // Retrieve the current size (thickness) of the scroll bars. That is @@ -121,7 +114,6 @@ void DrawViewShell::ArrangeGUIElements (void) Point aHPos = maViewPos; aHPos.Y() += maViewSize.Height(); - ViewShell::ArrangeGUIElements (); maTabControl.Hide(); @@ -248,7 +240,6 @@ void DrawViewShell::ReadFrameViewData(FrameView* pView) if( nTmp != 9 ) mpDrawView->SetMarkHdlSizePixel( 9 ); - SdrPageView* pPageView = mpDrawView->GetSdrPageView(); if (pPageView) { @@ -319,7 +310,6 @@ void DrawViewShell::ReadFrameViewData(FrameView* pView) mpDrawView->SetFrameDragSingles( pView->IsFrameDragSingles() ); } - /** * Apply data of the current view on the FrameView */ @@ -405,8 +395,6 @@ void DrawViewShell::WriteFrameViewData() mpFrameView->SetDrawMode(GetActiveWindow()->GetDrawMode()); } - - void DrawViewShell::PrePaint() { mpDrawView->PrePaint(); @@ -462,7 +450,6 @@ void DrawViewShell::SetZoomFactor(const Fraction& rZoomX, const Fraction& rZoomY GetActiveWindow()->SetWinViewPos(aOrigin); } - void DrawViewShell::HidePage() { FmFormShell* pFormShell = GetViewShellBase().GetFormShellManager()->GetFormShell(); @@ -470,8 +457,6 @@ void DrawViewShell::HidePage() pFormShell->PrepareClose(false); } - - void DrawViewShell::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rSequence, bool bBrowse ) { WriteFrameViewData(); @@ -563,9 +548,6 @@ void DrawViewShell::VisAreaChanged(const Rectangle& rRect) rController.FireVisAreaChanged (rRect); } - - - /** If there is a valid controller then create a new instance of <type>AccessibleDrawDocumentView</type>. Otherwise return an empty reference. @@ -593,9 +575,6 @@ void DrawViewShell::VisAreaChanged(const Rectangle& rRect) return ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>(); } - - - int DrawViewShell::GetActiveTabLayerIndex (void) const { const LayerTabBar* pBar @@ -606,9 +585,6 @@ int DrawViewShell::GetActiveTabLayerIndex (void) const return -1; } - - - void DrawViewShell::SetActiveTabLayerIndex (int nIndex) { LayerTabBar* pBar = GetLayerTabControl (); @@ -629,21 +605,11 @@ void DrawViewShell::SetActiveTabLayerIndex (int nIndex) } } - - - - - - - LayerTabBar* DrawViewShell::GetLayerTabControl (void) { return mpLayerTabBar.get(); } - - - int DrawViewShell::GetTabLayerCount (void) const { const LayerTabBar* pBar @@ -654,7 +620,6 @@ int DrawViewShell::GetTabLayerCount (void) const return 0; } - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx index 04b83a16764a..a84dbe36c7df 100644 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -134,7 +134,6 @@ void DrawViewShell::GetFormTextState(SfxItemSet& rSet) } } - void DrawViewShell::ExecAnimationWin( SfxRequest& rReq ) { // nothing is executed during a slide show! @@ -217,7 +216,6 @@ void DrawViewShell::GetAnimationWinState( SfxItemSet& rSet ) rSet.Put( SfxUInt16Item( SID_ANIMATOR_STATE, nValue ) ); } - void DrawViewShell::SetChildWindowState( SfxItemSet& rSet ) { // State of SfxChild-Windows (Animator, Fontwork etc.) @@ -273,7 +271,6 @@ void DrawViewShell::SetChildWindowState( SfxItemSet& rSet ) } } - /** * Handle SfxRequests for pipette */ diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index d57b4a6ad2ba..005991c00a00 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -1406,14 +1406,12 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) } } - // Menuoption: Change->Convert->To Bitmap, Change->Convert->To Metafile // disable, if there only Bitmap or Metafiles marked // Menuoption: Format->Area, Format->Line // disabled, if the marked objects not able to handle // these attributes - bool bSingleGraphicSelected = false; if (!mpDrawView->AreObjectsMarked()) @@ -1522,7 +1520,6 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) rSet.DisableItem (SID_ATTR_GRAF_CROP); } - // Menuoption: Edit->Hyperlink // Disable, if there is no hyperlink @@ -1742,8 +1739,6 @@ void DrawViewShell::GetModeSwitchingMenuState (SfxItemSet &rSet) svx::FontworkBar::getState( mpDrawView, rSet ); } - - void DrawViewShell::GetState (SfxItemSet& rSet) { // Iterate over all requested items in the set. @@ -1767,9 +1762,6 @@ void DrawViewShell::GetState (SfxItemSet& rSet) } } - - - void DrawViewShell::Execute (SfxRequest& rReq) { if(SlideShow::IsRunning(GetViewShellBase())) diff --git a/sd/source/ui/view/drviews8.cxx b/sd/source/ui/view/drviews8.cxx index 70b858c2b118..cdcddc26f201 100644 --- a/sd/source/ui/view/drviews8.cxx +++ b/sd/source/ui/view/drviews8.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "DrawViewShell.hxx" #include "ViewShellHint.hxx" diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx index 1524153407ff..76075ee56188 100644 --- a/sd/source/ui/view/drviews9.cxx +++ b/sd/source/ui/view/drviews9.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "DrawViewShell.hxx" #include <vcl/wrkwin.hxx> #include <svx/xgrad.hxx> @@ -47,7 +46,6 @@ #include <sfx2/viewfrm.hxx> - #include "app.hrc" #include "strings.hrc" #include "Window.hxx" @@ -63,7 +61,6 @@ namespace sd { - void DrawViewShell::ExecGallery(SfxRequest& rReq) { // nothing is executed during a slide show! @@ -97,7 +94,6 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq) aPageSize.Width() -= pPage->GetLftBorder() + pPage->GetRgtBorder(); aPageSize.Height() -= pPage->GetUppBorder() + pPage->GetLwrBorder(); - // Falls Grafik zu gross, wird die Grafik // in die Seite eingepasst if ( ( ( aSize.Height() > aPageSize.Height() ) || ( aSize.Width() > aPageSize.Width() ) ) && @@ -166,7 +162,6 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq) } } - if( bInsertNewObject ) { pGrafObj = new SdrGrafObj(aGraphic, aRect); @@ -184,8 +179,6 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq) GetDocSh()->SetWaitCursor( false ); } - - void DrawViewShell::GetGalleryState(SfxItemSet& ) { } diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index badc272ff18d..627dfda9cfd0 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "DrawViewShell.hxx" #include <com/sun/star/scanner/ScannerManager.hpp> #include <cppuhelper/implbase1.hxx> @@ -40,7 +39,6 @@ #include <svx/fontworkbar.hxx> #include <svx/clipfmtitem.hxx> - #include <sfx2/viewfrm.hxx> #include <svx/fmshell.hxx> #include <svtools/cliplistener.hxx> @@ -80,10 +78,8 @@ namespace sd { bool DrawViewShell::mbPipette = false; - // - ScannerEventListener - - class ScannerEventListener : public ::cppu::WeakImplHelper1< lang::XEventListener > { private: @@ -101,21 +97,16 @@ public: void ParentDestroyed() { mpParent = NULL; } }; - - ScannerEventListener::~ScannerEventListener() { } - - void SAL_CALL ScannerEventListener::disposing( const lang::EventObject& rEventObject ) throw (uno::RuntimeException, std::exception) { if( mpParent ) mpParent->ScannerEvent( rEventObject ); } - DrawViewShell::DrawViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, ::Window* pParentWindow, PageKind ePageKind, FrameView* pFrameViewArgument ) : ViewShell (pFrame, pParentWindow, rViewShellBase) , maTabControl(this, pParentWindow) @@ -139,7 +130,6 @@ DrawViewShell::DrawViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBas doShow(); } - DrawViewShell::~DrawViewShell() { mpSelectionChangeHandler->Disconnect(); @@ -382,9 +372,6 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind) mpViewOverlayManager.reset( new ViewOverlayManager( GetViewShellBase() ) ); } - - - void DrawViewShell::Init (bool bIsMainViewShell) { ViewShell::Init(bIsMainViewShell); @@ -392,9 +379,6 @@ void DrawViewShell::Init (bool bIsMainViewShell) StartListening (*GetDocSh()); } - - - void DrawViewShell::Shutdown (void) { ViewShell::Shutdown(); @@ -406,9 +390,6 @@ void DrawViewShell::Shutdown (void) } } - - - css::uno::Reference<css::drawing::XDrawSubController> DrawViewShell::CreateSubController (void) { css::uno::Reference<css::drawing::XDrawSubController> xSubController; @@ -425,9 +406,6 @@ css::uno::Reference<css::drawing::XDrawSubController> DrawViewShell::CreateSubCo return xSubController; } - - - bool DrawViewShell::RelocateToParentWindow (::Window* pParentWindow) { // DrawViewShells can not be relocated to a new parent window at the @@ -436,9 +414,6 @@ bool DrawViewShell::RelocateToParentWindow (::Window* pParentWindow) return pParentWindow==GetParentWindow(); } - - - /** * check if we have to draw a polyline */ @@ -585,7 +560,6 @@ void DrawViewShell::SetupPage (Size &rSize, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); } - void DrawViewShell::GetStatusBarState(SfxItemSet& rSet) { /* Zoom-Item @@ -785,8 +759,6 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet) } } - - void DrawViewShell::Notify (SfxBroadcaster&, const SfxHint& rHint) { const SfxSimpleHint* pSimple = dynamic_cast< const SfxSimpleHint* >(&rHint); @@ -818,17 +790,12 @@ void DrawViewShell::ExecuteAnnotation (SfxRequest& rRequest) mpAnnotationManager->ExecuteAnnotation( rRequest ); } - - void DrawViewShell::GetAnnotationState (SfxItemSet& rItemSet ) { if( mpAnnotationManager.get() ) mpAnnotationManager->GetAnnotationState( rItemSet ); } - - - ::rtl::OUString DrawViewShell::GetSidebarContextName (void) const { ::svx::sidebar::SelectionAnalyzer::ViewType eViewType (::svx::sidebar::SelectionAnalyzer::VT_Standard); @@ -853,7 +820,6 @@ void DrawViewShell::GetAnnotationState (SfxItemSet& rItemSet ) eViewType)); } - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx index cc6383e7215b..58f8e602ddba 100644 --- a/sd/source/ui/view/drviewsb.cxx +++ b/sd/source/ui/view/drviewsb.cxx @@ -138,9 +138,6 @@ bool DrawViewShell::RenameSlide( sal_uInt16 nPageId, const OUString & rName ) return bSuccess; } - - - IMPL_LINK( DrawViewShell, RenameSlideHdl, AbstractSvxNameDialog*, pDialog ) { if( ! pDialog ) @@ -154,9 +151,6 @@ IMPL_LINK( DrawViewShell, RenameSlideHdl, AbstractSvxNameDialog*, pDialog ) return long(pCurrentPage && ( aNewName == pCurrentPage->GetName() || GetDocSh()->IsNewPageNameValid( aNewName ) )); } - - - void DrawViewShell::ModifyLayer ( SdrLayer* pLayer, const OUString& rLayerName, diff --git a/sd/source/ui/view/drviewsc.cxx b/sd/source/ui/view/drviewsc.cxx index 7b3094b15cc4..b5a4e3147a81 100644 --- a/sd/source/ui/view/drviewsc.cxx +++ b/sd/source/ui/view/drviewsc.cxx @@ -289,7 +289,6 @@ void DrawViewShell::UpdateToolboxImages( SfxItemSet &rSet, bool bPermanent ) } } - sal_uInt16 DrawViewShell::GetMappedSlot( sal_uInt16 nSId ) { sal_uInt16 nSlot = 0; @@ -320,8 +319,6 @@ sal_uInt16 DrawViewShell::GetArrayId( sal_uInt16 nSId ) return( USHRT_MAX ); } - - void DrawViewShell::UpdateIMapDlg( SdrObject* pObj ) { if( ( pObj->ISA( SdrGrafObj ) || pObj->ISA( SdrOle2Obj ) ) && !mpDrawView->IsTextEdit() && @@ -354,8 +351,6 @@ void DrawViewShell::UpdateIMapDlg( SdrObject* pObj ) } } - - IMPL_LINK( DrawViewShell, NameObjectHdl, AbstractSvxNameDialog*, pDialog ) { OUString aName; diff --git a/sd/source/ui/view/drviewsd.cxx b/sd/source/ui/view/drviewsd.cxx index 6ae24c353b78..31c500c72d4f 100644 --- a/sd/source/ui/view/drviewsd.cxx +++ b/sd/source/ui/view/drviewsd.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "DrawViewShell.hxx" #include <svx/svxids.hrc> @@ -31,7 +30,6 @@ #include <sfx2/viewfrm.hxx> - #include "app.hrc" #include "sdpage.hxx" @@ -159,7 +157,6 @@ void DrawViewShell::ExecNavigatorWin( SfxRequest& rReq ) } } - void DrawViewShell::GetNavigatorWinState( SfxItemSet& rSet ) { sal_uInt32 nState = NAVSTATE_NONE; diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index cd643b026980..6015d8ca95be 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/presentation/XPresentation2.hpp> #include <com/sun/star/form/FormButtonType.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -835,7 +834,6 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) nFormat = pIsActive->GetValue(); } - if( nFormat && aDataHelper.GetTransferable().is() ) { sal_Int8 nAction = DND_ACTION_COPY; @@ -1013,7 +1011,6 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) } break; - case SID_CLOSE_MASTER_VIEW: { Broadcast ( @@ -1034,12 +1031,10 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) SFX_CALLMODE_ASYNCHRON); } - rReq.Done(); } break; - case SID_RULER: { const SfxItemSet* pReqArgs = rReq.GetArgs(); @@ -1493,7 +1488,6 @@ void DrawViewShell::FuSupportRotate(SfxRequest &rReq) } } - void DrawViewShell::InsertURLField(const OUString& rURL, const OUString& rText, const OUString& rTarget, const Point* pPos) { @@ -1552,7 +1546,6 @@ void DrawViewShell::InsertURLField(const OUString& rURL, const OUString& rText, } } - void DrawViewShell::InsertURLButton(const OUString& rURL, const OUString& rText, const OUString& rTarget, const Point* pPos) { diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index d161d0ffcb66..6e0f791ad3bd 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "DrawViewShell.hxx" #include <com/sun/star/form/FormButtonType.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -270,8 +269,6 @@ void DrawViewShell::GetCtrlState(SfxItemSet &rSet) } } - - void DrawViewShell::GetAttrState( SfxItemSet& rSet ) { SfxWhichIter aIter( rSet ); @@ -576,7 +573,6 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) SfxItemSet aNewAttr( GetPool(), EE_ITEMS_START, EE_ITEMS_END ); aNewAttr.Put( aEditAttr, false ); - boost::scoped_ptr<SvxNumRule> pNumRule; const SfxPoolItem* pTmpItem=NULL; sal_uInt16 nNumItemId = SID_ATTR_NUMBERING_RULE; @@ -750,8 +746,6 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) } } - - OUString DrawViewShell::GetSelectionText(bool bCompleteWords) { OUString aStrSelection; @@ -778,7 +772,6 @@ OUString DrawViewShell::GetSelectionText(bool bCompleteWords) return (aStrSelection); } - bool DrawViewShell::HasSelection(bool bText) const { bool bReturn = false; diff --git a/sd/source/ui/view/drviewsg.cxx b/sd/source/ui/view/drviewsg.cxx index fd6398a1ad3f..cbb919c2ac1d 100644 --- a/sd/source/ui/view/drviewsg.cxx +++ b/sd/source/ui/view/drviewsg.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "DrawViewShell.hxx" #include "ViewShellImplementation.hxx" @@ -29,7 +28,6 @@ #include <svx/svdograf.hxx> #include <svx/svdoole2.hxx> - #include "app.hrc" #include "drawdoc.hxx" @@ -100,7 +98,6 @@ void DrawViewShell::GetIMapState( SfxItemSet& rSet ) rSet.Put( SfxBoolItem( SID_IMAP_EXEC, bDisable ) ); } - void DrawViewShell::ExecOptionsBar( SfxRequest& rReq ) { // during a slide show, nothing is executed! @@ -118,7 +115,6 @@ void DrawViewShell::ExecOptionsBar( SfxRequest& rReq ) pOptions->SetSolidDragging( !mpDrawView->IsSolidDragging() ); break; - // Grid- / Help lines option case SID_GRID_VISIBLE: // not here yet! { @@ -150,7 +146,6 @@ void DrawViewShell::ExecOptionsBar( SfxRequest& rReq ) } break; - case SID_SNAP_BORDER: { pOptions->SetSnapBorder( !mpDrawView->IsBordSnap() ); @@ -169,7 +164,6 @@ void DrawViewShell::ExecOptionsBar( SfxRequest& rReq ) } break; - case SID_QUICKEDIT: { pOptions->SetQuickEdit( !mpDrawView->IsQuickTextEditMode() ); @@ -217,8 +211,6 @@ void DrawViewShell::ExecOptionsBar( SfxRequest& rReq ) } - - void DrawViewShell::GetOptionsBarState( SfxItemSet& rSet ) { rSet.Put( SfxBoolItem( SID_SOLID_CREATE, mpDrawView->IsSolidDragging() ) ); diff --git a/sd/source/ui/view/drviewsh.cxx b/sd/source/ui/view/drviewsh.cxx index c8e1e631ad35..70f5bccf379a 100644 --- a/sd/source/ui/view/drviewsh.cxx +++ b/sd/source/ui/view/drviewsh.cxx @@ -17,14 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "DrawViewShell.hxx" #include <svl/aeitem.hxx> #include <svl/itemset.hxx> #include <sfx2/request.hxx> #include <svx/svxids.hrc> - #include <svx/fmshell.hxx> #include <sfx2/dispatch.hxx> diff --git a/sd/source/ui/view/drviewsi.cxx b/sd/source/ui/view/drviewsi.cxx index b66d2d2919ff..c87934adf35d 100644 --- a/sd/source/ui/view/drviewsi.cxx +++ b/sd/source/ui/view/drviewsi.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "DrawViewShell.hxx" #include <svx/xtable.hxx> #include "sdattr.hxx" @@ -36,7 +35,6 @@ #include <svx/dialogs.hrc> #include <vcl/msgbox.hxx> - #include "app.hrc" #include "strings.hrc" diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx index 9b0717619ea3..6cd39555cff5 100644 --- a/sd/source/ui/view/drviewsj.cxx +++ b/sd/source/ui/view/drviewsj.cxx @@ -37,7 +37,6 @@ #include <sfx2/docfile.hxx> #include <rtl/ustrbuf.hxx> - #include "app.hrc" #include "Outliner.hxx" @@ -512,7 +511,6 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) } - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx index a5fdb8862cb7..6b147a439314 100644 --- a/sd/source/ui/view/frmview.cxx +++ b/sd/source/ui/view/frmview.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "FrameView.hxx" #include <svx/svxids.hrc> @@ -51,7 +50,6 @@ using namespace ::std; namespace sd { - FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK */) : SdrView(pDrawDoc, (OutputDevice*) NULL), mnRefCount(0), @@ -250,20 +248,15 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK * } - FrameView::~FrameView() { } - - void FrameView::Connect() { mnRefCount++; } - - void FrameView::Disconnect() { if (mnRefCount > 0) @@ -325,7 +318,6 @@ void FrameView::Update(SdOptions* pOptions) } } - /** * Set EditMode (Page or MasterPage) of working mode */ @@ -345,7 +337,6 @@ void FrameView::SetViewShEditMode(EditMode eMode, PageKind eKind) } } - /** * Return EditMode (Page or MasterPage) of working mode */ @@ -369,21 +360,11 @@ EditMode FrameView::GetViewShEditMode(PageKind eKind) return (eMode); } - - - void FrameView::SetViewShEditModeOnLoad (EditMode eMode) { meEditModeOnLoad = eMode; } - - - - - - - static OUString createHelpLinesString( const SdrHelpLineList& rHelpLines ) { OUStringBuffer aLines; @@ -944,55 +925,26 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < : } } - - - void FrameView::SetPreviousViewShellType (ViewShell::ShellType eType) { mePreviousViewShellType = eType; } - - - - - - - void FrameView::SetViewShellTypeOnLoad (ViewShell::ShellType eType) { meViewShellTypeOnLoad = eType; } - - - - - - - void FrameView::SetSelectedPage(sal_uInt16 nPage) { mnSelectedPage = nPage; } - - - - - - - void FrameView::SetIsNavigatorShowingAllShapes (const bool bIsNavigatorShowingAllShapes) { mbIsNavigatorShowingAllShapes = bIsNavigatorShowingAllShapes; } - - - - - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/view/grviewsh.cxx b/sd/source/ui/view/grviewsh.cxx index 253a6e77cd72..1156dfa000e4 100644 --- a/sd/source/ui/view/grviewsh.cxx +++ b/sd/source/ui/view/grviewsh.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "GraphicViewShell.hxx" #include "LayerTabBar.hxx" #include "FrameView.hxx" @@ -32,7 +31,6 @@ namespace sd { static const int TABCONTROL_INITIAL_SIZE = 350; - GraphicViewShell::GraphicViewShell ( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, @@ -52,9 +50,6 @@ GraphicViewShell::~GraphicViewShell (void) { } - - - void GraphicViewShell::ConstructGraphicViewShell(void) { meShellType = ST_DRAW; @@ -67,9 +62,6 @@ void GraphicViewShell::ConstructGraphicViewShell(void) mpLayerTabBar->Show(); } - - - void GraphicViewShell::ChangeEditMode ( EditMode eMode, bool ) @@ -80,9 +72,6 @@ void GraphicViewShell::ChangeEditMode ( DrawViewShell::ChangeEditMode (eMode, true); } - - - void GraphicViewShell::ArrangeGUIElements (void) { if (mpLayerTabBar.get()!=NULL && mpLayerTabBar->IsVisible()) @@ -117,9 +106,6 @@ void GraphicViewShell::ArrangeGUIElements (void) DrawViewShell::ArrangeGUIElements(); } - - - IMPL_LINK(GraphicViewShell, TabBarSplitHandler, TabBar*, pTabBar) { const long int nMax = maViewSize.Width() diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx index 976d8a6a26ba..f916b8fe24d1 100644 --- a/sd/source/ui/view/outlnvs2.cxx +++ b/sd/source/ui/view/outlnvs2.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "OutlineViewShell.hxx" #include <com/sun/star/presentation/XPresentation2.hpp> @@ -72,7 +71,6 @@ using namespace ::com::sun::star::beans; namespace sd { - /************************************************************************/ /** @@ -631,7 +629,6 @@ void OutlineViewShell::FuTemporaryModify(SfxRequest &rReq) Invalidate(SID_PASTE_UNFORMATTED); } - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 2cb952d56ad8..03e899d280e1 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -169,9 +169,6 @@ void OutlineViewShell::Construct(DrawDocShell* ) GetActiveWindow()->SetUniqueId( HID_SDOUTLINEVIEWSHELL ); } - - - Reference<drawing::XDrawSubController> OutlineViewShell::CreateSubController (void) { Reference<drawing::XDrawSubController> xSubController; @@ -187,7 +184,6 @@ Reference<drawing::XDrawSubController> OutlineViewShell::CreateSubController (vo return xSubController; } - /** * Default constructor, windows must not center themselves automatically */ @@ -220,7 +216,6 @@ OutlineViewShell::OutlineViewShell ( doShow(); } - OutlineViewShell::~OutlineViewShell() { DisposeFunctions(); @@ -237,9 +232,6 @@ OutlineViewShell::~OutlineViewShell() } } - - - void OutlineViewShell::Shutdown (void) { ViewShell::Shutdown(); @@ -247,9 +239,6 @@ void OutlineViewShell::Shutdown (void) PrepareClose(); } - - - /** * Paint method: the event gets forwarded from pWindow to the Viewshell * and the current function @@ -283,7 +272,6 @@ void OutlineViewShell::ArrangeGUIElements () { pWindow->SetMinZoomAutoCalc(false); - // change OuputArea of the OutlinerView OutlinerView* pOutlinerView = pOlView->GetViewByWindow(pWindow); @@ -335,25 +323,16 @@ void OutlineViewShell::ExecCtrl(SfxRequest &rReq) } } - - - void OutlineViewShell::AddWindow (::sd::Window* pWin) { pOlView->AddWindowToPaintView(pWin); } - - - void OutlineViewShell::RemoveWindow (::sd::Window* pWin) { pOlView->DeleteWindowFromPaintView(pWin); } - - - /** * Activate(): during the first invocation the fields get updated */ @@ -743,7 +722,6 @@ void OutlineViewShell::FuPermanent(SfxRequest &rReq) } } - IMPL_LINK( OutlineViewShell, ClipboardChanged, TransferableDataHelper*, pDataHelper ) { if ( pDataHelper ) @@ -1172,7 +1150,6 @@ bool OutlineViewShell::PrepareClose( bool bUI ) return pOlView == NULL || pOlView->PrepareClose(bUI); } - /** * Zoom with zoom factor. Inform OutlinerView */ @@ -1285,8 +1262,6 @@ void OutlineViewShell::ReadFrameViewData(FrameView* pView) pOlView->SetActualPage(pLastPage); } - - /** * Write actual views data to FrameView */ @@ -1306,7 +1281,6 @@ void OutlineViewShell::WriteFrameViewData() mpFrameView->SetSelectedPage((pActualPage->GetPageNum() - 1) / 2); } - /** * Handle SfxRequests for the StatusBar */ @@ -1314,7 +1288,6 @@ void OutlineViewShell::ExecStatusBar(SfxRequest&) { } - void OutlineViewShell::GetStatusBarState(SfxItemSet& rSet) { // Zoom-Item @@ -1349,7 +1322,6 @@ void OutlineViewShell::GetStatusBarState(SfxItemSet& rSet) } } - // page view and layout sal_uInt16 nPageCount = GetDoc()->GetSdPageCount( PK_STANDARD ); @@ -1415,7 +1387,6 @@ void OutlineViewShell::GetStatusBarState(SfxItemSet& rSet) rSet.Put( SfxStringItem( SID_STATUS_LAYOUT, aLayoutStr ) ); } - void OutlineViewShell::Command( const CommandEvent& rCEvt, ::sd::Window* pWin ) { if ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU ) @@ -1447,8 +1418,6 @@ void OutlineViewShell::Command( const CommandEvent& rCEvt, ::sd::Window* pWin ) } } - - bool OutlineViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) { bool bReturn = false; @@ -1486,7 +1455,6 @@ bool OutlineViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) return(bReturn); } - /** * Return text of the selection */ @@ -1513,7 +1481,6 @@ OUString OutlineViewShell::GetSelectionText(bool bCompleteWords) return (aStrSelection); } - /** * Is something selected? */ @@ -1534,7 +1501,6 @@ bool OutlineViewShell::HasSelection(bool bText) const return bReturn; } - /** * Status of Attribute-Items */ @@ -1635,9 +1601,6 @@ void OutlineViewShell::GetAttrState( SfxItemSet& rSet ) rSet.Put( aAllSet, false ); } - - - void OutlineViewShell::MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin) { // first the base classes @@ -1658,8 +1621,6 @@ void OutlineViewShell::MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin Invalidate( SID_PREVIEW_STATE ); } - - SdPage* OutlineViewShell::getCurrentPage() const { // since there are no master pages in outline view, we can @@ -1687,7 +1648,6 @@ void OutlineViewShell::UpdatePreview( SdPage* pPage, bool ) } } - bool OutlineViewShell::UpdateTitleObject( SdPage* pPage, Paragraph* pPara ) { DBG_ASSERT( pPage, "sd::OutlineViewShell::UpdateTitleObject(), pPage == 0?" ); @@ -1769,7 +1729,6 @@ bool OutlineViewShell::UpdateTitleObject( SdPage* pPage, Paragraph* pPara ) return bNewObject; } - bool OutlineViewShell::UpdateOutlineObject( SdPage* pPage, Paragraph* pPara ) { DBG_ASSERT( pPage, "sd::OutlineViewShell::UpdateOutlineObject(), pPage == 0?" ); @@ -1875,7 +1834,6 @@ bool OutlineViewShell::UpdateOutlineObject( SdPage* pPage, Paragraph* pPara ) return bNewObject; } - /** * Fill Outliner from Stream */ @@ -1986,9 +1944,6 @@ void OutlineViewShell::VisAreaChanged(const Rectangle& rRect) return ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >(); } - - - void OutlineViewShell::GetState (SfxItemSet& rSet) { // Iterate over all requested items in the set. @@ -2011,9 +1966,6 @@ void OutlineViewShell::GetState (SfxItemSet& rSet) } } - - - void OutlineViewShell::SetCurrentPage (SdPage* pPage) { // Adapt the selection of the model. @@ -2030,7 +1982,6 @@ void OutlineViewShell::SetCurrentPage (SdPage* pPage) pOlView->SetActualPage(pPage); } - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index 058c01556722..712dbe293a78 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -152,7 +152,6 @@ OutlineView::OutlineView( DrawDocShell& rDocSh, ::Window* pWindow, OutlineViewSh maBulletFont.SetOutline(false); maBulletFont.SetShadow(false); - Reference<XFrame> xFrame (mrOutlineViewShell.GetViewShellBase().GetFrame()->GetTopFrame().GetFrameInterface(), UNO_QUERY); const OUString aSlotURL( ".uno:ShowSlide" ); @@ -422,7 +421,6 @@ SdPage* OutlineView::InsertSlideForParagraph( Paragraph* pPara ) } } - // the "example" page is the previous page - if it is available if (nTarget > 0) { @@ -1042,7 +1040,6 @@ SdrTextObj* OutlineView::CreateOutlineTextObject(SdPage* pPage) return GetOutlineTextObject(pPage); } - /** updates draw model with all changes from outliner model */ bool OutlineView::PrepareClose(bool) { @@ -1232,7 +1229,6 @@ IMPL_LINK_INLINE_START( OutlineView, IndentingPagesHdl, OutlinerView *, pOutline } IMPL_LINK_INLINE_END( OutlineView, IndentingPagesHdl, OutlinerView *, pOutlinerView ) - /** returns the first slide that is selected in the outliner or where the cursor is located */ SdPage* OutlineView::GetActualPage() diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx index b9e01ef458c9..6454b1436115 100644 --- a/sd/source/ui/view/presvish.cxx +++ b/sd/source/ui/view/presvish.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/presentation/XSlideShowController.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -109,7 +108,6 @@ void PresentationViewShell::FinishInitialization( FrameView* pFrameView ) GetActiveWindow()->GrabFocus(); } - SvxRuler* PresentationViewShell::CreateHRuler(::sd::Window*, bool) { return NULL; @@ -120,7 +118,6 @@ SvxRuler* PresentationViewShell::CreateVRuler(::sd::Window*) return NULL; } - void PresentationViewShell::Activate( bool bIsMDIActivate ) { DrawViewShell::Activate( bIsMDIActivate ); diff --git a/sd/source/ui/view/sdruler.cxx b/sd/source/ui/view/sdruler.cxx index e39bf32d3847..2e4006a6aaaf 100644 --- a/sd/source/ui/view/sdruler.cxx +++ b/sd/source/ui/view/sdruler.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "Ruler.hxx" #include <svl/ptitem.hxx> #include <svx/ruler.hxx> @@ -25,7 +24,6 @@ #include <sfx2/ctrlitem.hxx> #include <sfx2/bindings.hxx> - #include "View.hxx" #include "DrawViewShell.hxx" #include "Window.hxx" @@ -70,8 +68,6 @@ void RulerCtrlItem::StateChanged( sal_uInt16 nSId, SfxItemState, const SfxPoolIt } } - - Ruler::Ruler( DrawViewShell& rViewSh, ::Window* pParent, ::sd::Window* pWin, sal_uInt16 nRulerFlags, SfxBindings& rBindings, WinBits nWinStyle) : SvxRuler(pParent, pWin, nRulerFlags, rBindings, nWinStyle) , pSdView(NULL) @@ -94,7 +90,6 @@ Ruler::Ruler( DrawViewShell& rViewSh, ::Window* pParent, ::sd::Window* pWin, sal } } - Ruler::~Ruler() { SfxBindings& rBindings = pCtrlItem->GetBindings(); @@ -103,7 +98,6 @@ Ruler::~Ruler() rBindings.LeaveRegistrations(); } - void Ruler::MouseButtonDown(const MouseEvent& rMEvt) { Point aMPos = rMEvt.GetPosPixel(); @@ -119,19 +113,16 @@ void Ruler::MouseButtonDown(const MouseEvent& rMEvt) SvxRuler::MouseButtonDown(rMEvt); } - void Ruler::MouseMove(const MouseEvent& rMEvt) { SvxRuler::MouseMove(rMEvt); } - void Ruler::MouseButtonUp(const MouseEvent& rMEvt) { SvxRuler::MouseButtonUp(rMEvt); } - void Ruler::SetNullOffset(const Point& rOffset) { long nOffset; @@ -142,7 +133,6 @@ void Ruler::SetNullOffset(const Point& rOffset) SetNullOffsetLogic(nOffset); } - void Ruler::Command(const CommandEvent& rCEvt) { if( rCEvt.GetCommand() == COMMAND_CONTEXTMENU && @@ -152,7 +142,6 @@ void Ruler::Command(const CommandEvent& rCEvt) } } - void Ruler::ExtraDown() { if( !pDrViewShell->GetView()->IsTextEdit() ) diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index a4c639387596..3828c82ad752 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -104,7 +104,6 @@ namespace sd { TYPEINIT1(View, FmFormView); - View::View(SdDrawDocument& rDrawDoc, OutputDevice* pOutDev, ViewShell* pViewShell) : FmFormView(&rDrawDoc, pOutDev), @@ -155,7 +154,6 @@ void View::ImplClearDrawDropMarker() } } - View::~View() { maSmartTags.Dispose(); @@ -175,7 +173,6 @@ View::~View() } } - class ViewRedirector : public ::sdr::contact::ViewObjectContactRedirector { public: @@ -518,7 +515,6 @@ void View::CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contac } } - void View::MarkListHasChanged() { FmFormView::MarkListHasChanged(); @@ -527,20 +523,17 @@ void View::MarkListHasChanged() maSmartTags.deselect(); } - bool View::SetAttributes(const SfxItemSet& rSet, bool bReplaceAll) { bool bOk = FmFormView::SetAttributes(rSet, bReplaceAll); return (bOk); } - bool View::GetAttributes( SfxItemSet& rTargetSet, bool bOnlyHardAttr ) const { return( FmFormView::GetAttributes( rTargetSet, bOnlyHardAttr ) ); } - /** * Is a presentation object selected? */ @@ -610,7 +603,6 @@ bool View::IsPresObjSelected(bool bOnPage, bool bOnMasterPage, bool bCheckPresOb return (bSelected); } - void View::SelectAll() { if ( IsTextEdit() ) @@ -625,22 +617,18 @@ void View::SelectAll() } } - - void View::ModelHasChanged() { // First, notify SdrView FmFormView::ModelHasChanged(); } - bool View::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr) { // forward to SdrView return FmFormView::SetStyleSheet(pStyleSheet, bDontRemoveHardAttr); } - /** * Start text input */ @@ -811,8 +799,6 @@ SdrEndTextEditKind View::SdrEndTextEdit(bool bDontDeleteReally) return(eKind); } - - /** restores the default text if the given text object is currently in edit mode and no text has been entered already. Is only useful just before text edit ends. */ bool View::RestoreDefaultText( SdrTextObj* pTextObj ) diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index 9fdad1d90b76..8e90a28870db 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -71,10 +71,8 @@ namespace sd { using namespace ::com::sun::star; - // - SdNavigatorDropEvent - - struct SdNavigatorDropEvent : public ExecuteDropEvent { DropTargetHelper& mrTargetHelper; @@ -96,8 +94,6 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent {} }; - - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > View::CreateClipboardDataObject( View*, ::Window& ) { // since SdTransferable::CopyToClipboard is called, this @@ -161,8 +157,6 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent return xRet; } - - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > View::CreateDragDataObject( View* pWorkView, ::Window& rWindow, const Point& rDragPos ) { SdTransferable* pTransferable = new SdTransferable( &mrDoc, pWorkView, false ); @@ -212,8 +206,6 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent return xRet; } - - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > View::CreateSelectionDataObject( View* pWorkView, ::Window& rWindow ) { SdTransferable* pTransferable = new SdTransferable( &mrDoc, pWorkView, true ); @@ -239,8 +231,6 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent return xRet; } - - void View::UpdateSelectionClipboard( bool bForceDeselect ) { if( mpViewSh && mpViewSh->GetActiveWindow() ) @@ -255,8 +245,6 @@ void View::UpdateSelectionClipboard( bool bForceDeselect ) } } - - void View::DoCut(::Window* ) { const OutlinerView* pOLV = GetTextEditOutlinerView(); @@ -274,8 +262,6 @@ void View::DoCut(::Window* ) } } - - void View::DoCopy (::Window* pWindow) { const OutlinerView* pOLV = GetTextEditOutlinerView(); @@ -289,8 +275,6 @@ void View::DoCopy (::Window* pWindow) } } - - void View::DoPaste (::Window* pWindow) { TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( mpViewSh->GetActiveWindow() ) ); @@ -370,8 +354,6 @@ void View::DoPaste (::Window* pWindow) } } - - void View::StartDrag( const Point& rStartPos, ::Window* pWindow ) { if( AreObjectsMarked() && IsAction() && mpViewSh && pWindow && !mpDragSrcMarkList ) @@ -403,8 +385,6 @@ void View::StartDrag( const Point& rStartPos, ::Window* pWindow ) } } - - void View::DragFinished( sal_Int8 nDropAction ) { const bool bUndo = IsUndoEnabled(); @@ -467,8 +447,6 @@ void View::DragFinished( sal_Int8 nDropAction ) mpDragSrcMarkList = NULL; } - - sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window*, sal_uInt16, sal_uInt16 nLayer ) { @@ -648,8 +626,6 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge return nRet; } - - sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow, sal_uInt16 nPage, sal_uInt16 nLayer ) { @@ -833,8 +809,6 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar return nRet; } - - IMPL_LINK( View, ExecuteNavigatorDrop, SdNavigatorDropEvent*, pSdNavigatorDropEvent ) { TransferableDataHelper aDataHelper( pSdNavigatorDropEvent->maDropEvent.Transferable ); diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index 315433c93223..335b58af287a 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -77,10 +77,8 @@ #include <svx/xbtmpit.hxx> #include <boost/scoped_ptr.hpp> - // - Namespaces - - using namespace ::com::sun::star; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; @@ -915,7 +913,6 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, Graphic aGraphic; sal_uLong nGrFormat = 0; - // insert replacement image ( if there is one ) into the object helper if ( nGrFormat ) { diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index 7b64cc8af556..70adc9d90864 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -355,7 +355,6 @@ SdrMediaObj* View::InsertMediaObj( const OUString& rMediaURL, const OUString& rM if( pPickObj ) aRect = pPickObj->GetLogicRect(); - pNewMediaObj = new SdrMediaObj( aRect ); bool bIsPres = false; diff --git a/sd/source/ui/view/sdview5.cxx b/sd/source/ui/view/sdview5.cxx index 9023d028ad49..0554de617761 100644 --- a/sd/source/ui/view/sdview5.cxx +++ b/sd/source/ui/view/sdview5.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "sdpage.hxx" #include "View.hxx" #include "pres.hxx" diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index 4247b6a4e946..6e26ba91747e 100644 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "Window.hxx" #include <sfx2/dispatch.hxx> #include <sfx2/request.hxx> @@ -51,8 +50,6 @@ namespace sd { #define MIN_ZOOM 5 ///< minimal zoom factor #define MAX_ZOOM 3000 ///< maximal zoom factor - - Window::Window(::Window* pParent) : ::Window(pParent, WinBits(WB_CLIPCHILDREN | WB_DIALOGCONTROL)), DropTargetHelper( this ), @@ -94,7 +91,6 @@ Window::Window(::Window* pParent) EnableRTL(false); } - Window::~Window (void) { if (mpViewShell != NULL) @@ -105,9 +101,6 @@ Window::~Window (void) } } - - - void Window::SetViewShell (ViewShell* pViewSh) { WindowUpdater* pWindowUpdater = NULL; @@ -174,33 +167,16 @@ void Window::CalcMinZoom() } } - - - void Window::SetMinZoom (long int nMin) { mnMinZoom = (sal_uInt16) nMin; } - - - - - - - void Window::SetMaxZoom (long int nMax) { mnMaxZoom = (sal_uInt16) nMax; } - - - - - - - long Window::GetZoom (void) const { if( GetMapMode().GetScaleX().GetDenominator() ) @@ -214,10 +190,6 @@ long Window::GetZoom (void) const } } - - - - void Window::Resize() { ::Window::Resize(); @@ -227,21 +199,18 @@ void Window::Resize() mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_ATTR_ZOOMSLIDER ); } - void Window::PrePaint() { if ( mpViewShell ) mpViewShell->PrePaint(); } - void Window::Paint(const Rectangle& rRect) { if ( mpViewShell ) mpViewShell->Paint(rRect, this); } - void Window::KeyInput(const KeyEvent& rKEvt) { if (!(mpViewShell && mpViewShell->KeyInput(rKEvt, this))) @@ -257,21 +226,18 @@ void Window::KeyInput(const KeyEvent& rKEvt) } } - void Window::MouseButtonDown(const MouseEvent& rMEvt) { if ( mpViewShell ) mpViewShell->MouseButtonDown(rMEvt, this); } - void Window::MouseMove(const MouseEvent& rMEvt) { if ( mpViewShell ) mpViewShell->MouseMove(rMEvt, this); } - void Window::MouseButtonUp(const MouseEvent& rMEvt) { mnTicks = 0; @@ -280,14 +246,12 @@ void Window::MouseButtonUp(const MouseEvent& rMEvt) mpViewShell->MouseButtonUp(rMEvt, this); } - void Window::Command(const CommandEvent& rCEvt) { if ( mpViewShell ) mpViewShell->Command(rCEvt, this); } - bool Window::Notify( NotifyEvent& rNEvt ) { bool nResult = false; @@ -301,7 +265,6 @@ bool Window::Notify( NotifyEvent& rNEvt ) return nResult; } - void Window::RequestHelp(const HelpEvent& rEvt) { if ( mpViewShell ) @@ -313,21 +276,6 @@ void Window::RequestHelp(const HelpEvent& rEvt) ::Window::RequestHelp( rEvt ); } - - - - - - - - - - - - - - - /** * Set the position of the upper left corner from the visible area of the * window. @@ -354,17 +302,11 @@ void Window::SetViewSize(const Size& rSize) CalcMinZoom(); } - - - void Window::SetCenterAllowed (bool bIsAllowed) { mbCenterAllowed = bIsAllowed; } - - - long Window::SetZoomFactor(long nZoom) { // Clip the zoom factor to the valid range marked by nMinZoom as @@ -558,17 +500,11 @@ long Window::SetZoomRect (const Rectangle& rZoomRect) return(nNewZoom); } - - - void Window::SetMinZoomAutoCalc (bool bAuto) { mbMinZoomAutoCalc = bAuto; } - - - /** * Calculate and set new MapMode origin. * If aWinPos.X()/Y() == -1, then we center the corresponding position (e.g. for @@ -620,9 +556,6 @@ void Window::UpdateMapOrigin(bool bInvalidate) Invalidate(); } - - - void Window::UpdateMapMode (void) { maWinPos -= maViewOrigin; @@ -664,9 +597,6 @@ void Window::UpdateMapMode (void) SetMapMode(aMap); } - - - /** * @returns X position of the visible area as fraction (< 1) of the whole * working area. @@ -781,8 +711,6 @@ void Window::GrabFocus() ::Window::GrabFocus (); } - - void Window::DataChanged( const DataChangedEvent& rDCEvt ) { ::Window::DataChanged( rDCEvt ); @@ -920,10 +848,6 @@ void Window::DataChanged( const DataChangedEvent& rDCEvt ) } } - - - - sal_Int8 Window::AcceptDrop( const AcceptDropEvent& rEvt ) { sal_Int8 nRet = DND_ACTION_NONE; @@ -940,7 +864,6 @@ sal_Int8 Window::AcceptDrop( const AcceptDropEvent& rEvt ) return nRet; } - sal_Int8 Window::ExecuteDrop( const ExecuteDropEvent& rEvt ) { sal_Int8 nRet = DND_ACTION_NONE; @@ -953,18 +876,11 @@ sal_Int8 Window::ExecuteDrop( const ExecuteDropEvent& rEvt ) return nRet; } - - - void Window::SetUseDropScroll (bool bUseDropScroll) { mbUseDropScroll = bUseDropScroll; } - - - - void Window::DropScroll(const Point& rMousePos) { short nDx = 0; @@ -1007,9 +923,6 @@ void Window::DropScroll(const Point& rMousePos) } } - - - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> Window::CreateAccessible (void) diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx index 2df6a85b04b7..92896b965821 100644 --- a/sd/source/ui/view/tabcontr.cxx +++ b/sd/source/ui/view/tabcontr.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "TabControl.hxx" #include <sfx2/viewfrm.hxx> @@ -25,7 +24,6 @@ #include <svx/svdpagv.hxx> #include <sfx2/dispatch.hxx> - #include "sdattr.hxx" #include "sdmod.hxx" #include "app.hrc" @@ -42,39 +40,29 @@ #include "DrawDocShell.hxx" #include "sdresid.hxx" - namespace sd { - // - SdTabControl::SdPageObjsTransferable - - TabControl::TabControlTransferable::~TabControlTransferable() { } - - void TabControl::TabControlTransferable::AddSupportedFormats() { AddFormat( SOT_FORMATSTR_ID_STARDRAW_TABBAR ); } - - bool TabControl::TabControlTransferable::GetData( const css::datatransfer::DataFlavor& /*rFlavor*/, const OUString& /*rDestDoc*/ ) { return false; } - - void TabControl::TabControlTransferable::DragFinished( sal_Int8 nDropAction ) { mrParent.DragFinished( nDropAction ); } - TabControl::TabControl(DrawViewShell* pViewSh, Window* pParent) : TabBar( pParent, WinBits( WB_BORDER | WB_3DLOOK | WB_SCROLL | WB_SIZEABLE | WB_DRAG) ), DragSourceHelper( this ), @@ -89,7 +77,6 @@ TabControl::TabControl(DrawViewShell* pViewSh, Window* pParent) : SetHelpId( HID_SD_TABBAR_PAGES ); } - TabControl::~TabControl() { } @@ -161,7 +148,6 @@ void TabControl::DoubleClick() } } - void TabControl::StartDrag( sal_Int8, const Point& ) { bInternalMove = true; @@ -170,13 +156,11 @@ void TabControl::StartDrag( sal_Int8, const Point& ) ( new TabControl::TabControlTransferable( *this ) )->StartDrag( this, DND_ACTION_COPYMOVE ); } - void TabControl::DragFinished( sal_Int8 ) { bInternalMove = false; } - sal_Int8 TabControl::AcceptDrop( const AcceptDropEvent& rEvt ) { sal_Int8 nRet = DND_ACTION_NONE; @@ -216,7 +200,6 @@ sal_Int8 TabControl::AcceptDrop( const AcceptDropEvent& rEvt ) return nRet; } - sal_Int8 TabControl::ExecuteDrop( const ExecuteDropEvent& rEvt ) { SdDrawDocument* pDoc = pDrViewSh->GetDoc(); @@ -368,18 +351,12 @@ bool TabControl::DeactivatePage() return pDrViewSh->IsSwitchPageAllowed(); } - - - void TabControl::SendActivatePageEvent (void) { CallEventListeners (VCLEVENT_TABBAR_PAGEACTIVATED, reinterpret_cast<void*>(GetCurPageId())); } - - - void TabControl::SendDeactivatePageEvent (void) { CallEventListeners (VCLEVENT_TABBAR_PAGEDEACTIVATED, diff --git a/sd/source/ui/view/unmodpg.cxx b/sd/source/ui/view/unmodpg.cxx index e7af9b07c20e..fcfadf25d940 100644 --- a/sd/source/ui/view/unmodpg.cxx +++ b/sd/source/ui/view/unmodpg.cxx @@ -31,11 +31,8 @@ #include "sdresid.hxx" #include "drawdoc.hxx" - TYPEINIT1(ModifyPageUndoAction, SdUndoAction); - - ModifyPageUndoAction::ModifyPageUndoAction( SdDrawDocument* pTheDoc, SdPage* pThePage, @@ -120,7 +117,6 @@ void ModifyPageUndoAction::Undo() SID_SWITCHPAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD ); } - void ModifyPageUndoAction::Redo() { // invalidate Selection, there could be objects deleted in this UNDO @@ -164,18 +160,15 @@ void ModifyPageUndoAction::Redo() SID_SWITCHPAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD ); } - ModifyPageUndoAction::~ModifyPageUndoAction() { } - OUString ModifyPageUndoAction::GetComment() const { return maComment; } - RenameLayoutTemplateUndoAction::RenameLayoutTemplateUndoAction( SdDrawDocument* pDocument, const OUString& rOldLayoutName, diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index 9d32cfd59043..ec952a8e0cfe 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "sddll.hxx" #include <com/sun/star/frame/XFrame.hpp> @@ -63,13 +62,9 @@ namespace sd { class ImageButtonHdl; - - static const sal_uInt16 gButtonSlots[] = { SID_INSERT_TABLE, SID_INSERT_DIAGRAM, SID_INSERT_GRAPHIC, SID_INSERT_AVMEDIA }; static const sal_uInt16 gButtonToolTips[] = { STR_INSERT_TABLE, STR_INSERT_CHART, STR_INSERT_PICTURE, STR_INSERT_MOVIE }; - - static BitmapEx loadImageResource( sal_uInt16 nId ) { SdResId aResId( nId ); @@ -78,8 +73,6 @@ static BitmapEx loadImageResource( sal_uInt16 nId ) return BitmapEx( aResId ); } - - static BitmapEx* getButtonImage( int index, bool large ) { static vcl::DeleteOnDeinit< BitmapEx > gSmallButtonImages[BMP_PLACEHOLDER_SMALL_END - BMP_PLACEHOLDER_SMALL_START] = { 0, 0, 0, 0, 0, 0, 0, 0 }; @@ -104,8 +97,6 @@ static BitmapEx* getButtonImage( int index, bool large ) } } - - const sal_uInt32 SMART_TAG_HDL_NUM = SAL_MAX_UINT32; class ChangePlaceholderTag : public SmartTag @@ -158,8 +149,6 @@ private: sal_uLong mnTip; }; - - ImageButtonHdl::ImageButtonHdl( const SmartTagReference& xTag /*, sal_uInt16 nSID, const Image& rImage, const Image& rImageMO*/, const Point& rPnt ) : SmartHdl( xTag, rPnt ) , mxTag( dynamic_cast< ChangePlaceholderTag* >( xTag.get() ) ) @@ -169,15 +158,11 @@ ImageButtonHdl::ImageButtonHdl( const SmartTagReference& xTag /*, sal_uInt16 nSI { } - - ImageButtonHdl::~ImageButtonHdl() { HideTip(); } - - void ImageButtonHdl::HideTip() { if( mnTip ) @@ -223,8 +208,6 @@ void ImageButtonHdl::onMouseEnter(const MouseEvent& rMEvt) } } - - void ImageButtonHdl::onMouseLeave() { mnHighlightId = -1; @@ -232,8 +215,6 @@ void ImageButtonHdl::onMouseLeave() Touch(); } - - void ImageButtonHdl::CreateB2dIAObject() { // first throw away old one @@ -277,43 +258,31 @@ void ImageButtonHdl::CreateB2dIAObject() } } - - bool ImageButtonHdl::IsFocusHdl() const { return false; } - - bool ImageButtonHdl::isMarkable() const { return false; } - - Pointer ImageButtonHdl::GetPointer() const { return Pointer( POINTER_ARROW ); } - - ChangePlaceholderTag::ChangePlaceholderTag( ::sd::View& rView, SdrObject& rPlaceholderObj ) : SmartTag( rView ) , mxPlaceholderObj( &rPlaceholderObj ) { } - - ChangePlaceholderTag::~ChangePlaceholderTag() { } - - /** returns true if the ChangePlaceholderTag handled the event. */ bool ChangePlaceholderTag::MouseButtonDown( const MouseEvent& /*rMEvt*/, SmartHdl& rHdl ) { @@ -338,8 +307,6 @@ bool ChangePlaceholderTag::MouseButtonDown( const MouseEvent& /*rMEvt*/, SmartHd return false; } - - /** returns true if the SmartTag consumes this event. */ bool ChangePlaceholderTag::KeyInput( const KeyEvent& rKEvt ) { @@ -359,8 +326,6 @@ bool ChangePlaceholderTag::KeyInput( const KeyEvent& rKEvt ) } } - - BitmapEx ChangePlaceholderTag::createOverlayImage( int nHighlight ) { BitmapEx aRet; @@ -438,29 +403,21 @@ void ChangePlaceholderTag::addCustomHandles( SdrHdlList& rHandlerList ) } } - - void ChangePlaceholderTag::disposing() { SmartTag::disposing(); } - - void ChangePlaceholderTag::select() { SmartTag::select(); } - - void ChangePlaceholderTag::deselect() { SmartTag::deselect(); } - - ViewOverlayManager::ViewOverlayManager( ViewShellBase& rViewShellBase ) : mrBase( rViewShellBase ) , mnUpdateTagsEvent( 0 ) @@ -475,8 +432,6 @@ ViewOverlayManager::ViewOverlayManager( ViewShellBase& rViewShellBase ) StartListening( *mrBase.GetDocShell() ); } - - ViewOverlayManager::~ViewOverlayManager() { Link aLink( LINK(this,ViewOverlayManager,EventMultiplexerListener) ); @@ -491,8 +446,6 @@ ViewOverlayManager::~ViewOverlayManager() DisposeTags(); } - - void ViewOverlayManager::Notify(SfxBroadcaster&, const SfxHint& rHint) { const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint); @@ -558,8 +511,6 @@ bool ViewOverlayManager::CreateTags() return bChanges; } - - bool ViewOverlayManager::DisposeTags() { if( !maTagVector.empty() ) @@ -579,8 +530,6 @@ bool ViewOverlayManager::DisposeTags() return false; } - - IMPL_LINK(ViewOverlayManager,EventMultiplexerListener, tools::EventMultiplexerEvent*,pEvent) { diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index 68864d49d508..7401fdffadc5 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -475,7 +475,6 @@ void ViewShell::InvalidateWindows() mpContentWindow->Invalidate(); } - /** * Draw a selection rectangle with the ?provided pen on all split windows. */ @@ -658,8 +657,6 @@ void ViewShell::SetZoomFactor(const Fraction& rZoomX, const Fraction&) SetZoom(nZoom); } - - void ViewShell::SetActiveWindow (::sd::Window* pWin) { SfxViewShell* pViewShell = GetViewShell(); @@ -694,8 +691,6 @@ void ViewShell::SetActiveWindow (::sd::Window* pWin) } } - - bool ViewShell::RequestHelp(const HelpEvent& rHEvt, ::sd::Window*) { bool bReturn = false; @@ -714,18 +709,12 @@ bool ViewShell::RequestHelp(const HelpEvent& rHEvt, ::sd::Window*) return(bReturn); } - - - void ViewShell::SetFrameView (FrameView* pNewFrameView) { mpFrameView = pNewFrameView; ReadFrameViewData (mpFrameView); } - - - /************************************************************************* |* |* Read FrameViews data and set actual views data @@ -736,8 +725,6 @@ void ViewShell::ReadFrameViewData(FrameView*) { } - - /************************************************************************* |* |* Write actual views data to FrameView @@ -748,7 +735,6 @@ void ViewShell::WriteFrameViewData() { } - bool ViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb) { ErrCode aErrCode = 0; @@ -932,14 +918,12 @@ void ViewShell::ReadUserData(const OUString&) SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); } - void ViewShell::WriteUserData(OUString&) { // writing of our data is always done in WriteFrameViewData() WriteFrameViewData(); } - /** * Switch ruler on/off */ @@ -976,7 +960,6 @@ void ViewShell::SetRuler(bool bRuler) GetViewShell()->InvalidateBorder(); } - sal_Int8 ViewShell::AcceptDrop ( const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, @@ -988,7 +971,6 @@ sal_Int8 ViewShell::AcceptDrop ( return( pView ? pView->AcceptDrop( rEvt, rTargetHelper, pTargetWindow, nPage, nLayer ) : DND_ACTION_NONE ); } - sal_Int8 ViewShell::ExecuteDrop ( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, @@ -1020,7 +1002,6 @@ void ViewShell::WriteUserDataSequence ( css::uno::Sequence < css::beans::Propert mpFrameView->WriteUserDataSequence( rSequence, bBrowse ); } - void ViewShell::ReadUserDataSequence ( const css::uno::Sequence < css::beans::PropertyValue >& rSequence, bool bBrowse ) { mpFrameView->ReadUserDataSequence( rSequence, bBrowse ); diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx index 826a39447b89..07e2e5613d44 100644 --- a/sd/source/ui/view/viewshe3.cxx +++ b/sd/source/ui/view/viewshe3.cxx @@ -177,9 +177,6 @@ void ViewShell::GetMenuState( SfxItemSet &rSet ) } } - - - /** This method consists basically of three parts: 1. Process the arguments of the SFX request. 2. Use the model to create a new page or duplicate an existing one. @@ -402,7 +399,6 @@ SdPage* ViewShell::CreateOrDuplicatePage ( return pNewPage; } - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 11f710137d45..1c72efb9e8c6 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ViewShell.hxx" #include "ViewShellImplementation.hxx" #include "createtableobjectbar.hxx" @@ -107,10 +106,8 @@ private: ShellCache maShellCache; }; - } // end of anonymous namespace - namespace sd { bool ViewShell::IsPageFlipMode(void) const @@ -133,11 +130,9 @@ SfxViewFrame* ViewShell::GetViewFrame (void) const } } - /// declare SFX-Slotmap and standard interface TYPEINIT1(ViewShell, SfxShell); - ViewShell::ViewShell( SfxViewFrame*, ::Window* pParentWindow, ViewShellBase& rViewShellBase, bool bAllowCenter) : SfxShell(&rViewShellBase) , mbCenterAllowed(bAllowCenter) @@ -169,7 +164,6 @@ ViewShell::~ViewShell() } } - /** * common initialization part of both constructors */ @@ -272,9 +266,6 @@ void ViewShell::Init (bool bIsMainViewShell) SetActiveWindow (mpContentWindow.get()); } - - - void ViewShell::Exit (void) { sd::View* pView = GetView(); @@ -294,9 +285,6 @@ void ViewShell::Exit (void) SetIsMainViewShell(false); } - - - /** * set focus to working window */ @@ -357,8 +345,6 @@ void ViewShell::UIActivating( SfxInPlaceClient* ) GetViewShellBase().GetToolBarManager()->ToolBarsDestroyed(); } - - void ViewShell::UIDeactivated( SfxInPlaceClient* ) { OSL_ASSERT (GetViewShell()!=NULL); @@ -367,7 +353,6 @@ void ViewShell::UIDeactivated( SfxInPlaceClient* ) GetViewShellBase().GetToolBarManager()->SelectionHasChanged(*this, *GetDrawView()); } - void ViewShell::Deactivate(bool bIsMDIActivate) { // remove view from a still active drag'n'drop session @@ -405,17 +390,11 @@ void ViewShell::Deactivate(bool bIsMDIActivate) SfxShell::Deactivate(bIsMDIActivate); } - - - void ViewShell::Shutdown (void) { Exit (); } - - - bool ViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) { bool bReturn(false); @@ -447,7 +426,6 @@ bool ViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) if( GetView() ) bConsumed = GetView()->getSmartTags().KeyInput(rKEvt); - if( !bConsumed ) { rtl::Reference< sdr::SelectionController > xSelectionController( GetView()->getSelectionController() ); @@ -485,7 +463,6 @@ bool ViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) return(bReturn); } - void ViewShell::MouseButtonDown(const MouseEvent& rMEvt, ::sd::Window* pWin) { // We have to lock tool bar updates while the mouse button is pressed in @@ -525,7 +502,6 @@ void ViewShell::MouseButtonDown(const MouseEvent& rMEvt, ::sd::Window* pWin) } } - void ViewShell::MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin) { if (rMEvt.IsLeaveWindow()) @@ -559,7 +535,6 @@ void ViewShell::MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin) } } - void ViewShell::MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin) { if ( pWin ) @@ -590,8 +565,6 @@ void ViewShell::MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin) } } - - void ViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) { bool bDone = HandleScrollCommand (rCEvt, pWin); @@ -633,7 +606,6 @@ bool ViewShell::Notify(NotifyEvent& rNEvt, ::sd::Window* pWin) return nRet; } - bool ViewShell::HandleScrollCommand(const CommandEvent& rCEvt, ::sd::Window* pWin) { bool bDone = false; @@ -717,8 +689,6 @@ bool ViewShell::HandleScrollCommand(const CommandEvent& rCEvt, ::sd::Window* pWi return bDone; } - - void ViewShell::SetupRulers (void) { if(mbHasRulers && (mpContentWindow.get() != NULL) && !SlideShow::IsRunning(GetViewShellBase())) @@ -828,11 +798,6 @@ const SfxPoolItem* ViewShell::GetNumBulletItem(SfxItemSet& aNewAttr, sal_uInt16& return pTmpItem; } - - - - - void ViewShell::Resize (void) { SetupRulers (); @@ -892,9 +857,6 @@ SvBorder ViewShell::GetBorder (bool ) return aBorder; } - - - void ViewShell::ArrangeGUIElements (void) { if (mpImpl->mbArrangeActive) @@ -1000,16 +962,12 @@ void ViewShell::ArrangeGUIElements (void) mpImpl->mbArrangeActive = false; } - - - void ViewShell::SetUIUnit(FieldUnit eUnit) { // Set unit at horizontal and vertical rulers. if (mpHorizontalRuler.get() != NULL) mpHorizontalRuler->SetUnit(eUnit); - if (mpVerticalRuler.get() != NULL) mpVerticalRuler->SetUnit(eUnit); } @@ -1023,9 +981,6 @@ void ViewShell::SetDefTabHRuler( sal_uInt16 nDefTab ) mpHorizontalRuler->SetDefTabDist( nDefTab ); } - - - /** Tell the FmFormShell that the view shell is closing. Give it the opportunity to prevent that. */ @@ -1040,9 +995,6 @@ bool ViewShell::PrepareClose (bool bUI) return nResult; } - - - void ViewShell::UpdatePreview (SdPage*, bool ) { // Do nothing. After the actual preview has been removed, @@ -1085,9 +1037,6 @@ void ViewShell::UpdatePreview (SdPage*, bool ) return NULL; } - - - void ViewShell::ImpGetUndoStrings(SfxItemSet &rSet) const { ::svl::IUndoManager* pUndoManager = ImpGetUndoManager(); @@ -1115,8 +1064,6 @@ void ViewShell::ImpGetUndoStrings(SfxItemSet &rSet) const } } - - void ViewShell::ImpGetRedoStrings(SfxItemSet &rSet) const { ::svl::IUndoManager* pUndoManager = ImpGetUndoManager(); @@ -1145,8 +1092,6 @@ void ViewShell::ImpGetRedoStrings(SfxItemSet &rSet) const } } - - void ViewShell::ImpSidUndo(bool, SfxRequest& rReq) { ::svl::IUndoManager* pUndoManager = ImpGetUndoManager(); @@ -1194,8 +1139,6 @@ void ViewShell::ImpSidUndo(bool, SfxRequest& rReq) rReq.Done(); } - - void ViewShell::ImpSidRedo(bool, SfxRequest& rReq) { ::svl::IUndoManager* pUndoManager = ImpGetUndoManager(); @@ -1243,8 +1186,6 @@ void ViewShell::ImpSidRedo(bool, SfxRequest& rReq) rReq.Done(); } - - void ViewShell::ExecReq( SfxRequest& rReq ) { sal_uInt16 nSlot = rReq.GetSlot(); @@ -1287,9 +1228,6 @@ void ViewShell::ExecReq( SfxRequest& rReq ) } } - - - /** This default implemenation returns only an empty reference. See derived classes for more interesting examples. */ @@ -1303,40 +1241,26 @@ ViewShell::CreateAccessibleDocumentView (::sd::Window* ) ::com::sun::star::accessibility::XAccessible> (); } - - ::sd::WindowUpdater* ViewShell::GetWindowUpdater (void) const { return mpWindowUpdater.get(); } - - - ViewShellBase& ViewShell::GetViewShellBase (void) const { return *static_cast<ViewShellBase*>(GetViewShell()); } - - - ViewShell::ShellType ViewShell::GetShellType (void) const { return meShellType; } - - - DrawDocShell* ViewShell::GetDocSh (void) const { return GetViewShellBase().GetDocShell(); } - - - SdDrawDocument* ViewShell::GetDoc (void) const { return GetViewShellBase().GetDocument(); @@ -1439,38 +1363,18 @@ void ViewShell::SetIsMainViewShell (bool bIsMainViewShell) } } - - - - - - - void ViewShell::PrePaint() { } - - - void ViewShell::Paint (const Rectangle&, ::sd::Window* ) { } - - - void ViewShell::Draw(OutputDevice &, const Region &) { } - - - - - - - void ViewShell::ShowUIControls (bool bVisible) { mpImpl->mbIsShowingUIControls = bVisible; @@ -1497,10 +1401,6 @@ void ViewShell::ShowUIControls (bool bVisible) mpContentWindow->Show( bVisible ); } - - - - bool ViewShell::RelocateToParentWindow (::Window* pParentWindow) { mpParentWindow = pParentWindow; @@ -1549,13 +1449,8 @@ void ViewShell::NotifyAccUpdate( ) GetViewShellBase().GetDrawController().NotifyAccUpdate(); } - } // end of namespace sd - - - - //===== ViewShellObjectBarFactory ============================================= namespace { @@ -1566,9 +1461,6 @@ ViewShellObjectBarFactory::ViewShellObjectBarFactory ( { } - - - ViewShellObjectBarFactory::~ViewShellObjectBarFactory (void) { for (ShellCache::iterator aI(maShellCache.begin()); @@ -1579,9 +1471,6 @@ ViewShellObjectBarFactory::~ViewShellObjectBarFactory (void) } } - - - SfxShell* ViewShellObjectBarFactory::CreateShell ( ::sd::ShellId nId, ::Window*, @@ -1637,9 +1526,6 @@ SfxShell* ViewShellObjectBarFactory::CreateShell ( return pShell; } - - - void ViewShellObjectBarFactory::ReleaseShell (SfxShell* pShell) { if (pShell != NULL) diff --git a/sd/source/ui/view/zoomlist.cxx b/sd/source/ui/view/zoomlist.cxx index d039977d405d..d4428537e469 100644 --- a/sd/source/ui/view/zoomlist.cxx +++ b/sd/source/ui/view/zoomlist.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "zoomlist.hxx" #include <svx/svxids.hrc> |