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/ui/view | |
| parent | 78f6407978aa48c3cbb116bc281940dbf1f2dcbc (diff) | |
remove whitespaces
Change-Id: I9daea42a433b5032931a722878874917cf37f4d1
Diffstat (limited to 'sd/source/ui/view')
61 files changed, 0 insertions, 1775 deletions
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> |