diff options
| -rw-r--r-- | include/sfx2/sidebar/EnumContext.hxx | 7 | ||||
| -rw-r--r-- | sd/source/ui/framework/configuration/ResourceId.cxx | 16 | ||||
| -rw-r--r-- | sd/source/ui/framework/factories/TaskPanelResource.cxx | 132 | ||||
| -rw-r--r-- | sd/source/ui/framework/tools/FrameworkHelper.cxx | 55 | ||||
| -rw-r--r-- | sd/source/ui/inc/framework/FrameworkHelper.hxx | 11 | ||||
| -rw-r--r-- | sd/source/ui/inc/framework/ResourceId.hxx | 11 | ||||
| -rw-r--r-- | sd/source/ui/inc/framework/TaskPanelResource.hxx | 84 | ||||
| -rw-r--r-- | sfx2/source/sidebar/EnumContext.cxx | 16 | ||||
| -rw-r--r-- | sw/source/ui/cctrl/swlbox.cxx | 6 | ||||
| -rw-r--r-- | sw/source/ui/inc/swlbox.hxx | 1 | ||||
| -rw-r--r-- | unusedcode.easy | 43 |
11 files changed, 18 insertions, 364 deletions
diff --git a/include/sfx2/sidebar/EnumContext.hxx b/include/sfx2/sidebar/EnumContext.hxx index b0b505d65ccf..53292fecfea8 100644 --- a/include/sfx2/sidebar/EnumContext.hxx +++ b/include/sfx2/sidebar/EnumContext.hxx @@ -110,12 +110,6 @@ public: const ::rtl::OUString& rsApplicationName, const ::rtl::OUString& rsContextName); - /** Return a number that encodes both the application and context - enums. - Use the CombinedEnumContext macro in switch() statements and comparisons. - */ - sal_Int32 GetCombinedContext(void) const; - /** This variant of the GetCombinedContext() method treats some application names as identical to each other. Replacements made are: @@ -126,7 +120,6 @@ public: sal_Int32 GetCombinedContext_DI(void) const; const ::rtl::OUString& GetApplicationName (void) const; - Application GetApplication (void) const; Application GetApplication_DI (void) const; const ::rtl::OUString& GetContextName (void) const; diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx index fb1c771dc687..285ac6bf0edf 100644 --- a/sd/source/ui/framework/configuration/ResourceId.cxx +++ b/sd/source/ui/framework/configuration/ResourceId.cxx @@ -128,22 +128,6 @@ ResourceId::ResourceId ( ResourceId::ResourceId ( const OUString& rsResourceURL, - const ::std::vector<OUString>& rAnchorURLs) - : ResourceIdInterfaceBase(), - maResourceURLs(1+rAnchorURLs.size()), - mpURL() -{ - maResourceURLs[0] = rsResourceURL; - for (sal_uInt32 nIndex=0; nIndex<rAnchorURLs.size(); ++nIndex) - maResourceURLs[nIndex+1] = rAnchorURLs[nIndex]; - ParseResourceURL(); -} - - - - -ResourceId::ResourceId ( - const OUString& rsResourceURL, const OUString& rsFirstAnchorURL, const Sequence<OUString>& rAnchorURLs) : ResourceIdInterfaceBase(), diff --git a/sd/source/ui/framework/factories/TaskPanelResource.cxx b/sd/source/ui/framework/factories/TaskPanelResource.cxx deleted file mode 100644 index 754ae8cac580..000000000000 --- a/sd/source/ui/framework/factories/TaskPanelResource.cxx +++ /dev/null @@ -1,132 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#include "precompiled_sd.hxx" - -#include "framework/TaskPanelResource.hxx" - -#include <vcl/window.hxx> -#include <toolkit/helper/vclunohelper.hxx> - - -using namespace css; -using namespace cssu; -using namespace cssdf; - - -namespace sd { namespace framework { - -namespace { - ::Window* GetWindowForResource ( - ViewShellBase& rViewShellBase, - const cssu::Reference<cssdf::XResourceId>& rxResourceId) - { - ::Window* pWindow = NULL; - if (rxResourceId.is() && rxResourceId->getAnchor().is()) - { - ::boost::shared_ptr<FrameworkHelper> pFrameworkHelper (FrameworkHelper::Instance(rViewShellBase)); - Reference<awt::XWindow> xWindow ( - pFrameworkHelper->GetPaneWindow(rxResourceId->getAnchor()->getAnchor())); - pWindow = VCLUnoHelper::GetWindow(xWindow); - } - return pWindow; - } -} - - - - -TaskPanelResource::TaskPanelResource ( - sidebar::SidebarViewShell& rSidebarViewShell, - sidebar::PanelId ePanelId, - const Reference<XResourceId>& rxResourceId) - : TaskPanelResourceInterfaceBase(m_aMutex), - mxResourceId(rxResourceId), - mpControl(rSidebarViewShell.CreatePanel( - GetWindowForResource(rSidebarViewShell.GetViewShellBase(), rxResourceId), - ePanelId)) -{ - if (mpControl.get() != NULL) - { - mpControl->Show(); - mpControl->GetParent()->Show(); - mpControl->AddEventListener(LINK(this,TaskPanelResource,WindowEventHandler)); - } -} - - - - -TaskPanelResource::~TaskPanelResource (void) -{ - mpControl.reset(); -} - - - - -void SAL_CALL TaskPanelResource::disposing () -{ - mpControl.reset(); -} - - - - -Reference<XResourceId> SAL_CALL TaskPanelResource::getResourceId () - throw (css::uno::RuntimeException) -{ - return mxResourceId; -} - - - - -sal_Bool SAL_CALL TaskPanelResource::isAnchorOnly (void) - throw (RuntimeException) -{ - return false; -} - - - - -::Window* TaskPanelResource::GetControl (void) const -{ - return mpControl.get(); -} - - - - -IMPL_LINK(TaskPanelResource,WindowEventHandler,VclWindowEvent*,pEvent) -{ - if (pEvent!=NULL && pEvent->GetId()==SFX_HINT_DYING) - { - // Somebody else deleted the window. Release our reference so - // that we do not delete it again. - mpControl.release(); - return sal_True; - } - else - return sal_False; -} - -} } // end of namespace sd::framework - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index 8d9f2848f9c6..009077679d00 100644 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -509,61 +509,6 @@ Reference<XView> FrameworkHelper::GetView (const Reference<XResourceId>& rxPaneO -Reference<awt::XWindow> FrameworkHelper::GetPaneWindow (const Reference<XResourceId>& rxPaneId) -{ - Reference<awt::XWindow> xWindow; - - if (rxPaneId.is() && mxConfigurationController.is()) - { - try - { - if (rxPaneId->getResourceURL().match(msPaneURLPrefix)) - { - Reference<XPane> xPane (mxConfigurationController->getResource(rxPaneId), UNO_QUERY); - if (xPane.is()) - xWindow = xPane->getWindow(); - } - } - catch (lang::DisposedException&) - { - Dispose(); - } - catch (RuntimeException&) - { - } - } - - return xWindow; -} - - - - -Reference<XResource> FrameworkHelper::GetResource (const Reference<XResourceId>& rxResourceId) -{ - Reference<XResource> xResource; - - if (rxResourceId.is() && mxConfigurationController.is()) - { - try - { - return mxConfigurationController->getResource(rxResourceId); - } - catch (lang::DisposedException&) - { - Dispose(); - } - catch (RuntimeException&) - { - } - } - - return NULL; -} - - - - Reference<XResourceId> FrameworkHelper::RequestView ( const OUString& rsResourceURL, const OUString& rsAnchorURL) diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx index b4778dc32810..ff9acf7dedd2 100644 --- a/sd/source/ui/inc/framework/FrameworkHelper.hxx +++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx @@ -194,17 +194,6 @@ public: cssu::Reference<cssdf::XView> GetView ( const cssu::Reference<cssdf::XResourceId>& rxPaneOrViewId); - /** Return the XWindow that is represented by the pane with the - given resource id. - */ - cssu::Reference<css::awt::XWindow> GetPaneWindow ( - const cssu::Reference<cssdf::XResourceId>& rxPaneId); - - /** Return the XResource object with the given resource id. - */ - cssu::Reference<cssdf::XResource> GetResource ( - const cssu::Reference<cssdf::XResourceId>& rxResourceId); - /** Request the specified view to be displayed in the specified pane. When the pane is not visible its creation is also requested. The update that creates the actual view object is done asynchronously. diff --git a/sd/source/ui/inc/framework/ResourceId.hxx b/sd/source/ui/inc/framework/ResourceId.hxx index a0f763fbc8b2..f851bbf2d210 100644 --- a/sd/source/ui/inc/framework/ResourceId.hxx +++ b/sd/source/ui/inc/framework/ResourceId.hxx @@ -82,17 +82,6 @@ public: const OUString& rsResourceURL, const OUString& rsAnchorURL); - /** Create a new resource id for the specified resource type and the - given list of anchor URLs. - @param rsResourceURL - The URL of the actual resource. - @param rsAnchorURLs - The possibly empty list of anchor URLs. - */ - ResourceId ( - const OUString& rsResourceURL, - const ::std::vector<OUString>& rAnchorURLs); - /** Create a new resource id with an anchor that consists of a sequence of URLs that is extended by a further URL. @param rsResourceURL diff --git a/sd/source/ui/inc/framework/TaskPanelResource.hxx b/sd/source/ui/inc/framework/TaskPanelResource.hxx deleted file mode 100644 index 0ac6356829ef..000000000000 --- a/sd/source/ui/inc/framework/TaskPanelResource.hxx +++ /dev/null @@ -1,84 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#include <cppuhelper/compbase1.hxx> -#include <cppuhelper/basemutex.hxx> - -#include "SidebarPanelId.hxx" - -#include <com/sun/star/drawing/framework/XResource.hpp> -#include <boost/scoped_ptr.hpp> - - -namespace css = ::com::sun::star; -namespace cssu = ::com::sun::star::uno; -namespace cssdf = ::com::sun::star::drawing::framework; - -class Window; - -namespace sd { namespace sidebar { - class SidebarViewShell; -} } - - -namespace sd { namespace framework { - -typedef ::cppu::WeakComponentImplHelper1 < - cssdf::XResource - > TaskPanelResourceInterfaceBase; - - -/** A simple wrapper around a legacy task pane control that gives - access to that control (via GetControl()). -*/ -class TaskPanelResource - : private ::cppu::BaseMutex, - public TaskPanelResourceInterfaceBase -{ -public: - /** Create a resource object that represents the legacy taskpane - panel. - @param rxResourceId - drawing framework resource id - @param pControl - The new TaskPanelResource object takes ownership for this control. - */ - TaskPanelResource ( - sidebar::SidebarViewShell& rSidebarViewShell, - sidebar::PanelId ePanelId, - const cssu::Reference<cssdf::XResourceId>& rxResourceId); - virtual ~TaskPanelResource (void); - virtual void SAL_CALL disposing (void); - - // XResource - virtual cssu::Reference<cssdf::XResourceId> SAL_CALL getResourceId (void) throw (cssu::RuntimeException); - virtual sal_Bool SAL_CALL isAnchorOnly () throw (cssu::RuntimeException); - - ::Window* GetControl (void) const; - -private: - const cssu::Reference<cssdf::XResourceId> mxResourceId; - // Using auto_ptr because it has release(), what scoped_ptr doesn't. - ::std::auto_ptr< ::Window> mpControl; - - DECL_LINK(WindowEventHandler,VclWindowEvent*); -}; - -} } // end of namespace sd::framework - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/sidebar/EnumContext.cxx b/sfx2/source/sidebar/EnumContext.cxx index 5ba6957f5c86..59b937f24341 100644 --- a/sfx2/source/sidebar/EnumContext.cxx +++ b/sfx2/source/sidebar/EnumContext.cxx @@ -73,14 +73,6 @@ EnumContext::EnumContext ( -sal_Int32 EnumContext::GetCombinedContext (void) const -{ - return CombinedEnumContext(meApplication, meContext); -} - - - - sal_Int32 EnumContext::GetCombinedContext_DI (void) const { return CombinedEnumContext(GetApplication_DI(), meContext); @@ -113,14 +105,6 @@ EnumContext::Application EnumContext::GetApplication_DI (void) const -EnumContext::Application EnumContext::GetApplication (void) const -{ - return meApplication; -} - - - - const ::rtl::OUString& EnumContext::GetApplicationName (void) const { return EnumContext::GetApplicationName(meApplication); diff --git a/sw/source/ui/cctrl/swlbox.cxx b/sw/source/ui/cctrl/swlbox.cxx index 1ab23c8d2894..f3b9e09d1651 100644 --- a/sw/source/ui/cctrl/swlbox.cxx +++ b/sw/source/ui/cctrl/swlbox.cxx @@ -53,12 +53,6 @@ SwComboBox::SwComboBox(Window* pParent, WinBits nStyle) Init(); } -SwComboBox::SwComboBox(Window* pParent, const ResId& rId) - : ComboBox(pParent, rId) -{ - Init(); -} - void SwComboBox::Init() { // create administration for the resource's Stringlist diff --git a/sw/source/ui/inc/swlbox.hxx b/sw/source/ui/inc/swlbox.hxx index 747ffb76dd08..9c4885c133be 100644 --- a/sw/source/ui/inc/swlbox.hxx +++ b/sw/source/ui/inc/swlbox.hxx @@ -67,7 +67,6 @@ class SW_DLLPUBLIC SwComboBox : public ComboBox public: SwComboBox(Window* pParent, WinBits nStyle); - SwComboBox(Window* pParent, const ResId& rId); ~SwComboBox(); void InsertSwEntry(const SwBoxEntry&); diff --git a/unusedcode.easy b/unusedcode.easy index a8f893fe9296..042fca5dacca 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -37,6 +37,7 @@ ScCellValue::set(EditTextObject const&) ScCellValue::set(ScFormulaCell const&) ScColorScaleEntry::UpdateMoveTab(short, short, short) ScColumn::MoveListeners(SvtBroadcaster&, int) +ScColumn::SetRawString(sc::ColumnBlockPosition&, int, rtl::OUString const&, bool) ScComplexRefData::IsDeleted() const ScDBQueryDataIterator::DataAccessInternal::setPos(unsigned long) ScDPFilteredCache::SingleFilter::getMatchValue() const @@ -158,8 +159,6 @@ sc::sidebar::CellLineStyleValueSet::SetImage(Image) sc_apitest::main() sd::LeftDrawPaneShell::RegisterInterface(SfxModule*) sd::LeftImpressPaneShell::RegisterInterface(SfxModule*) -sd::framework::FrameworkHelper::GetPaneWindow(com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> const&) -sd::framework::FrameworkHelper::GetResource(com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> const&) sd::framework::Pane::SetWindow(Window*) sd::presenter::PresenterCanvas::copyRect(com::sun::star::uno::Reference<com::sun::star::rendering::XBitmapCanvas> const&, com::sun::star::geometry::RealRectangle2D const&, com::sun::star::rendering::ViewState const&, com::sun::star::rendering::RenderState const&, com::sun::star::geometry::RealRectangle2D const&, com::sun::star::rendering::ViewState const&, com::sun::star::rendering::RenderState const&) sd::sidebar::LayoutMenu::GetMinimumWidth() @@ -171,8 +170,6 @@ sfx2::sidebar::Context::EvaluateMatch(std::__debug::vector<sfx2::sidebar::Contex sfx2::sidebar::ContextList::IsEmpty() sfx2::sidebar::Deck::PrintWindowTree(std::__debug::vector<sfx2::sidebar::Panel*, std::allocator<sfx2::sidebar::Panel*> > const&) sfx2::sidebar::EnumContext::EvaluateMatch(std::__debug::vector<sfx2::sidebar::EnumContext, std::allocator<sfx2::sidebar::EnumContext> > const&) const -sfx2::sidebar::EnumContext::GetApplication() const -sfx2::sidebar::EnumContext::GetCombinedContext() const sfx2::sidebar::Paint::Set(sfx2::sidebar::Paint const&) sfx2::sidebar::Panel::PrintWindowTree() sfx2::sidebar::SidebarDockingWindow::GetChildWindow() @@ -191,34 +188,30 @@ writerfilter::doctok::CpAndFc::CpAndFc(writerfilter::doctok::Cp const&, writerfi writerfilter::doctok::DffBlock::DffBlock(writerfilter::doctok::WW8Stream&, unsigned int, unsigned int, unsigned int) writerfilter::doctok::DffBlock::getBlip(unsigned int) writerfilter::doctok::DffBlock::getShape(unsigned int) +writerfilter::doctok::DffOPT::get_extraoffset(unsigned int) writerfilter::doctok::DffRecord::DffRecord(writerfilter::doctok::WW8Stream&, unsigned int, unsigned int) writerfilter::doctok::DffRecord::DffRecord(writerfilter::doctok::WW8StructBase*, unsigned int, unsigned int) writerfilter::doctok::DffRecord::calcSize() const writerfilter::doctok::DffRecord::getShapeBid() writerfilter::doctok::DffRecord::getShapeId() -writerfilter::doctok::WW8ATRD::init() -writerfilter::doctok::WW8BKD::init() -writerfilter::doctok::WW8BKF::init() -writerfilter::doctok::WW8FFDATA::init() -writerfilter::doctok::WW8FLD::init() -writerfilter::doctok::WW8FRD::init() -writerfilter::doctok::WW8FSPA::init() -writerfilter::doctok::WW8FTXBXS::init() -writerfilter::doctok::WW8Fib::init() -writerfilter::doctok::WW8FibRgFcLcb2000::init() -writerfilter::doctok::WW8FontTable::init() -writerfilter::doctok::WW8FontTable::initPayload() -writerfilter::doctok::WW8LFOTable::init() -writerfilter::doctok::WW8LFOTable::initPayload() -writerfilter::doctok::WW8ListTable::init() -writerfilter::doctok::WW8ListTable::initPayload() +writerfilter::doctok::WW8FOPTE::get_stringValue() +writerfilter::doctok::WW8FontTable::getEntry(unsigned int) +writerfilter::doctok::WW8FontTable::getEntryCount() +writerfilter::doctok::WW8LFOLevel::calcSize() +writerfilter::doctok::WW8LFOTable::getEntry(unsigned int) +writerfilter::doctok::WW8LFOTable::getEntryCount() +writerfilter::doctok::WW8ListTable::getEntry(unsigned int) +writerfilter::doctok::WW8ListTable::getEntryCount() writerfilter::doctok::WW8PICF::get_DffRecord() writerfilter::doctok::WW8PICF::get_ffdata() -writerfilter::doctok::WW8PICF::init() -writerfilter::doctok::WW8SED::init() -writerfilter::doctok::WW8SttbRgtplc::init() +writerfilter::doctok::WW8SttbRgtplc::getEntry(unsigned int) +writerfilter::doctok::WW8SttbRgtplc::getEntryCount() writerfilter::doctok::WW8SttbTableResource::WW8SttbTableResource(boost::shared_ptr<writerfilter::doctok::WW8Sttbf>) writerfilter::doctok::WW8Sttbf::WW8Sttbf(writerfilter::doctok::WW8Stream&, unsigned int, unsigned int) -writerfilter::doctok::WW8StyleSheet::init() -writerfilter::doctok::WW8StyleSheet::initPayload() +writerfilter::doctok::WW8StyleSheet::getEntry(unsigned int) +writerfilter::doctok::WW8StyleSheet::getEntryCount() +writerfilter::dump(writerfilter::OutputWithDepth<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >&, char const*, boost::shared_ptr<writerfilter::Reference<writerfilter::BinaryObj> >) +writerfilter::dump(writerfilter::OutputWithDepth<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >&, char const*, boost::shared_ptr<writerfilter::Reference<writerfilter::Properties> >) +writerfilter::dump(writerfilter::OutputWithDepth<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >&, char const*, rtl::OUString const&) +writerfilter::dump(writerfilter::OutputWithDepth<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >&, char const*, unsigned int) writerfilter::ooxml::OOXMLFastContextHandler::mark(unsigned int const&, boost::shared_ptr<writerfilter::ooxml::OOXMLValue>) |