From 547ca766c6179398f5f8d7edbf44510feb7c10ab Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Sat, 17 Sep 2011 21:42:27 +0000 Subject: slidesorter1: #i115058# Removed unused classes PageObject and PageObjectFactory. # HG changeset patch # User Andre Fischer # Date 1287060980 -7200 # Node ID 805df2d00c12631fe697e8737a91199bf5f54ee3 # Parent 770385ae0c265c62134bf57eeca8283f7fe80b48 --- .../controller/SlsPageObjectFactory.cxx | 100 --------------------- .../inc/controller/SlsPageObjectFactory.hxx | 97 -------------------- .../ui/slidesorter/inc/view/SlsPageObject.hxx | 65 -------------- sd/source/ui/slidesorter/view/SlsPageObject.cxx | 80 ----------------- 4 files changed, 342 deletions(-) delete mode 100644 sd/source/ui/slidesorter/controller/SlsPageObjectFactory.cxx delete mode 100644 sd/source/ui/slidesorter/inc/controller/SlsPageObjectFactory.hxx delete mode 100644 sd/source/ui/slidesorter/inc/view/SlsPageObject.hxx delete mode 100644 sd/source/ui/slidesorter/view/SlsPageObject.cxx (limited to 'sd') diff --git a/sd/source/ui/slidesorter/controller/SlsPageObjectFactory.cxx b/sd/source/ui/slidesorter/controller/SlsPageObjectFactory.cxx deleted file mode 100644 index 5ac41849a674..000000000000 --- a/sd/source/ui/slidesorter/controller/SlsPageObjectFactory.cxx +++ /dev/null @@ -1,100 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_sd.hxx" - -#include "controller/SlsPageObjectFactory.hxx" - -#include "view/SlsPageObject.hxx" -#include "view/SlsPageObjectViewContact.hxx" -#include "view/SlsPageObjectViewObjectContact.hxx" - -#include "sdpage.hxx" - - -namespace sd { namespace slidesorter { namespace controller { - - -PageObjectFactory::PageObjectFactory ( - const ::boost::shared_ptr& rpCache, - const ::boost::shared_ptr& rpProperties) - : mpPageCache(rpCache), - mpProperties(rpProperties) -{ -} - - - - -PageObjectFactory::~PageObjectFactory (void) -{ -} - - - - -view::PageObject* PageObjectFactory::CreatePageObject ( - SdPage* pPage, - const model::SharedPageDescriptor& rpDescriptor) const -{ - return new view::PageObject( - Rectangle (Point(0,0), pPage->GetSize()), - pPage, - rpDescriptor); -} - - - - -::sdr::contact::ViewContact* - PageObjectFactory::CreateViewContact ( - view::PageObject* pPageObject, - const model::SharedPageDescriptor& rpDescriptor) const -{ - return new view::PageObjectViewContact ( - *pPageObject, - rpDescriptor); -} - - - - -::sdr::contact::ViewObjectContact* - PageObjectFactory::CreateViewObjectContact ( - ::sdr::contact::ObjectContact& rObjectContact, - ::sdr::contact::ViewContact& rViewContact) const -{ - return new view::PageObjectViewObjectContact ( - rObjectContact, - rViewContact, - mpPageCache, - mpProperties); -} - - -} } } // end of namespace ::sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/inc/controller/SlsPageObjectFactory.hxx b/sd/source/ui/slidesorter/inc/controller/SlsPageObjectFactory.hxx deleted file mode 100644 index 59e8f05a3883..000000000000 --- a/sd/source/ui/slidesorter/inc/controller/SlsPageObjectFactory.hxx +++ /dev/null @@ -1,97 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef SD_SLIDESORTER_PAGE_OBJECT_FACTORY_HEADER -#define SD_SLIDESORTER_PAGE_OBJECT_FACTORY_HEADER - -#include -#include "model/SlsSharedPageDescriptor.hxx" - -class SdPage; - -namespace sdr { namespace contact { -class ObjectContact; -class ViewContact; -class ViewObjectContact; -} } - -namespace sd { namespace slidesorter { namespace view { -class PageObject; -} } } - -namespace sd { namespace slidesorter { namespace cache { -class PageCache; -} } } - - -namespace sd { namespace slidesorter { namespace controller { - -class Properties; - -/** This class is a factory for the creation of objects that represent page - objects (shapes). This includes the contact objects of the drawing - layer. - -

The factory methods are called by the model::PageDescriptor and the - standard implementations of the contact objects.

- -

The factory forwars the preview cache and Properties object to page - objects and contact objects.

-*/ -class PageObjectFactory -{ -public: - /** Create a new PageObjectFactory object that has references to the - given cache and properties. - */ - PageObjectFactory ( - const ::boost::shared_ptr& rpCache, - const ::boost::shared_ptr& rpProperties); - PageObjectFactory (const ::boost::shared_ptr& rpCache); - virtual ~PageObjectFactory (void); - - virtual view::PageObject* CreatePageObject ( - SdPage* pPage, - const model::SharedPageDescriptor& rpDescriptor) const; - - virtual ::sdr::contact::ViewContact* CreateViewContact ( - view::PageObject* pPageObject, - const model::SharedPageDescriptor& rpDescriptor) const; - - virtual ::sdr::contact::ViewObjectContact* CreateViewObjectContact ( - ::sdr::contact::ObjectContact& rObjectContact, - ::sdr::contact::ViewContact& rViewContact) const; - -private: - ::boost::shared_ptr mpPageCache; - ::boost::shared_ptr mpProperties; -}; - -} } } // end of namespace ::sd::slidesorter::controller - -#endif - diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObject.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObject.hxx deleted file mode 100644 index 0f4ede6216c1..000000000000 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObject.hxx +++ /dev/null @@ -1,65 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef SD_SLIDESORTER_PAGE_OBJECT_HXX -#define SD_SLIDESORTER_PAGE_OBJECT_HXX - -#include "model/SlsSharedPageDescriptor.hxx" - -#include - -namespace sd { namespace slidesorter { namespace view { - - -/** This sub class of the SdrPageObject exists to create the view contact - and indirectly to create view-object-contact objects. -*/ -class PageObject - : public SdrPageObj -{ -public: - PageObject ( - const Rectangle& rRect, - SdrPage* pPage, - const model::SharedPageDescriptor& rpDescriptor); - - virtual ~PageObject (void); - - model::SharedPageDescriptor GetDescriptor (void) const; - -private: - model::SharedPageDescriptor mpDescriptor; - -protected: - virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact(); -}; - - - -} } } // end of namespace ::sd::slidesorter::view - -#endif diff --git a/sd/source/ui/slidesorter/view/SlsPageObject.cxx b/sd/source/ui/slidesorter/view/SlsPageObject.cxx deleted file mode 100644 index 28c572de9594..000000000000 --- a/sd/source/ui/slidesorter/view/SlsPageObject.cxx +++ /dev/null @@ -1,80 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_sd.hxx" - -#include "view/SlsPageObject.hxx" - -#include "model/SlsPageDescriptor.hxx" -#include "controller/SlsPageObjectFactory.hxx" - -using namespace ::sdr::contact; -using namespace ::sd::slidesorter::model; - - -namespace sd { namespace slidesorter { namespace view { - - -PageObject::PageObject ( - const Rectangle& rRectangle, - SdrPage* _pPage, - const SharedPageDescriptor& rpDescriptor) - : SdrPageObj(rRectangle, _pPage), - mpDescriptor(rpDescriptor) -{ -} - - - - -PageObject::~PageObject (void) -{ -} - - - - -SharedPageDescriptor PageObject::GetDescriptor (void) const -{ - return mpDescriptor; -} - - - - -sdr::contact::ViewContact* PageObject::CreateObjectSpecificViewContact() -{ - if (mpDescriptor.get() != NULL) - return mpDescriptor->GetPageObjectFactory().CreateViewContact(this, mpDescriptor); - else - return NULL; -} - - - -} } } // end of namespace ::sd::slidesorter::view -- cgit