diff options
author | Marcos Paulo de Souza <marcos.souza.org@gmail.com> | 2013-09-02 10:55:15 -0300 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2013-09-03 09:16:14 +0000 |
commit | b62826ad3887305a76ee1ceabe2060f9d6e8723f (patch) | |
tree | 554edd25a04e870c00799bb8d103ddfa3baf8de2 /sd | |
parent | ea7ce8cf08521a7609d2ffc0969b1541fbbb9d0c (diff) |
Remove more unused methods
Change-Id: I79548f9dd1b83ef940e7a1302cf7b728610fed4a
Reviewed-on: https://gerrit.libreoffice.org/5757
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/dlg/PhotoAlbumDialog.cxx | 22 | ||||
-rw-r--r-- | sd/source/ui/dlg/PhotoAlbumDialog.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/framework/tools/FrameworkHelper.cxx | 21 | ||||
-rw-r--r-- | sd/source/ui/inc/framework/FrameworkHelper.hxx | 5 | ||||
-rw-r--r-- | sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx | 29 | ||||
-rw-r--r-- | sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx | 1 |
6 files changed, 0 insertions, 82 deletions
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx index c321325ae78b..8820b5e7dce3 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx @@ -652,28 +652,6 @@ awt::Size SdPhotoAlbumDialog::createASRSize(const awt::Size& aPicSize, const awt return awt::Size(resizeWidth, resizeHeight); } -Reference< drawing::XShape > SdPhotoAlbumDialog::createXShapeFromUrl(const OUString& sUrl, - Reference< lang::XMultiServiceFactory > xShapeFactory, - Reference< graphic::XGraphicProvider> xProvider -) -{ - //First, we create an XGraphic - ::comphelper::NamedValueCollection aMediaProperties; - aMediaProperties.put( "URL", OUString( sUrl ) ); - Reference< graphic::XGraphic> xGraphic = - xProvider->queryGraphic( aMediaProperties.getPropertyValues() ); - //And then, we can create the XShape from the XGraphic - Reference< drawing::XShape > xShape( - xShapeFactory->createInstance("com.sun.star.drawing.GraphicObjectShape"), - uno::UNO_QUERY - ); - - Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY ); - xProps->setPropertyValue("Graphic", ::uno::Any(xGraphic)); - - return xShape; // Image loaded into XShape -} - Reference< graphic::XGraphic> SdPhotoAlbumDialog::createXGraphicFromUrl(const OUString& sUrl, Reference< graphic::XGraphicProvider> xProvider ) diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.hxx b/sd/source/ui/dlg/PhotoAlbumDialog.hxx index 302a00792cbe..99b93dd35e99 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.hxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.hxx @@ -84,10 +84,6 @@ private: awt::Size createASRSize(const awt::Size& aPicSize, const awt::Size& aMaxSize); - Reference< drawing::XShape > createXShapeFromUrl(const OUString& sUrl, - Reference< lang::XMultiServiceFactory > xShapeFactory, - Reference< graphic::XGraphicProvider> xProvider); - Reference< graphic::XGraphic> createXGraphicFromUrl(const OUString& sUrl, Reference< graphic::XGraphicProvider> xProvider); diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index a50da0bcbcbb..76bdae53aae6 100644 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -666,27 +666,6 @@ Reference<XResourceId> FrameworkHelper::RequestSidebarPanel ( return NULL; } - - - -void FrameworkHelper::RequestResourceDeactivation (const cssu::Reference<cssdf::XResourceId>& rxResourceId) -{ - try - { - if (mxConfigurationController.is() && rxResourceId.is()) - mxConfigurationController->requestResourceDeactivation(rxResourceId); - } - catch (lang::DisposedException&) - { - Dispose(); - } - catch (RuntimeException&) - {} -} - - - - ViewShell::ShellType FrameworkHelper::GetViewId (const OUString& rsViewURL) { if (mpViewURLMap->empty()) diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx index c5796adb717b..4e0b5898f1cc 100644 --- a/sd/source/ui/inc/framework/FrameworkHelper.hxx +++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx @@ -243,11 +243,6 @@ public: const OUString& rsSidebarPanelURL, const bool bEnsureTaskPaneIsVisible = true); - /** Request the deactivation of the specified resource. - */ - void RequestResourceDeactivation ( - const cssu::Reference<cssdf::XResourceId>& rxResourceId); - /** Process a slot call that requests a view shell change. */ void HandleModeChangeSlot ( diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx index a5fc7ed9b21c..a1ddbedf83b1 100644 --- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx @@ -318,35 +318,6 @@ IMPL_LINK(CurrentMasterPagesSelector,EventMultiplexerListener, return 0; } - - - -void CurrentMasterPagesSelector::NotifyHint (SfxBroadcaster&, const SfxHint& rHint) -{ - const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint); - if (pSimpleHint != NULL) - { - if (pSimpleHint->GetId() == SFX_HINT_DOCCHANGED) - { - // Is the edit view visible in the center pane? - ::boost::shared_ptr<DrawViewShell> pDrawViewShell ( - ::boost::dynamic_pointer_cast<DrawViewShell>(mrBase.GetMainViewShell())); - if (pDrawViewShell.get() != NULL) - { - // Is the edit view in master page mode? - if (pDrawViewShell->GetEditMode() == EM_MASTERPAGE) - { - // Mark the currently edited master page as precious. - SdPage* pCurrentMasterPage = pDrawViewShell->getCurrentPage(); - if (pCurrentMasterPage != NULL) - pCurrentMasterPage->SetPrecious(true); - } - } - } - } -} - - } } // end of namespace sd::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx index 37b228c9b49f..34c90b649362 100644 --- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx @@ -78,7 +78,6 @@ private: virtual void LateInit (void); DECL_LINK(EventMultiplexerListener,sd::tools::EventMultiplexerEvent*); - void NotifyHint (SfxBroadcaster&, const SfxHint& rHint); }; } } // end of namespace sd::sidebar |