diff options
23 files changed, 65 insertions, 612 deletions
diff --git a/include/sfx2/sidebar/Sidebar.hxx b/include/sfx2/sidebar/Sidebar.hxx index 2ce7b31499e1..458100ebb8b1 100644 --- a/include/sfx2/sidebar/Sidebar.hxx +++ b/include/sfx2/sidebar/Sidebar.hxx @@ -43,14 +43,6 @@ public: static void ShowPanel ( const ::rtl::OUString& rsPanelId, const cssu::Reference<css::frame::XFrame>& rxFrame); - - /** Switch to the specified deck. - Note that most of the work is done asynchronously and that - this function probably returns before the requested deck is visible. - */ - static void ShowDeck ( - const ::rtl::OUString& rsDeckId, - const cssu::Reference<css::frame::XFrame>& rxFrame); }; } } // end of namespace sfx2::sidebar diff --git a/include/sfx2/taskpane.hxx b/include/sfx2/taskpane.hxx index 0d0dd6eea199..0e25fcef0e7a 100644 --- a/include/sfx2/taskpane.hxx +++ b/include/sfx2/taskpane.hxx @@ -117,22 +117,6 @@ namespace sfx2 Window& i_rParentWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rDocumentFrame ); - /** creates a new instance - @param i_rParentWindow - the parent window - @param i_rDocumentFrame - the frame to which the task pane belongs. Will be passed to any custom tool panels created - via an XUIElementFactory. Also, it is used to determine the module which the task pane is - responsible for, thus controlling which tool panels are actually available. - @param i_rCompare - a comparator for tool panel URLs, which allows controlling the order in which the panels are - added to the tool panel deck. - */ - ModuleTaskPane( - Window& i_rParentWindow, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rDocumentFrame, - const IToolPanelCompare& i_rCompare - ); ~ModuleTaskPane(); /** determines whether a given module has any registered tool panels @@ -154,11 +138,6 @@ namespace sfx2 ::boost::optional< size_t > GetPanelPos( const OUString& i_rResourceURL ); - /** returns the resource URL of the panel at the specified position - */ - OUString - GetPanelResourceURL( const size_t i_nPanelPos ) const; - /// sets the "classical" layout of the tool panel deck, using drawers void SetDrawersLayout(); /// sets the new layout of the tool panel deck, using tabs diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx index 94ff94ddaa84..1120b09dabdf 100644 --- a/include/svx/rulritem.hxx +++ b/include/svx/rulritem.hxx @@ -194,9 +194,7 @@ public: void Append(const SvxColumnDescription& rDesc); void SetLeft(long aLeft); void SetRight(long aRight); - void SetActColumn(sal_uInt16 nCol); sal_uInt16 GetActColumn() const; - sal_uInt16 GetColumnDescription() const; sal_Bool IsFirstAct() const; sal_Bool IsLastAct() const; long GetLeft(); @@ -204,7 +202,6 @@ public: sal_Bool IsTable() const; sal_Bool CalcOrtho() const; void SetOrtho(sal_Bool bVal); - sal_Bool IsOrtho () const; sal_Bool IsConsistent() const; }; diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index f46f2aadf68a..8d9f2848f9c6 100644 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -923,20 +923,6 @@ Reference<XResourceId> FrameworkHelper::CreateResourceId ( Reference<XResourceId> FrameworkHelper::CreateResourceId ( const OUString& rsResourceURL, - const OUString& rsFirstAnchorURL, - const OUString& rsSecondAnchorURL) -{ - ::std::vector<OUString> aAnchorURLs (2); - aAnchorURLs[0] = rsFirstAnchorURL; - aAnchorURLs[1] = rsSecondAnchorURL; - return new ::sd::framework::ResourceId(rsResourceURL, aAnchorURLs); -} - - - - -Reference<XResourceId> FrameworkHelper::CreateResourceId ( - const OUString& rsResourceURL, const Reference<XResourceId>& rxAnchorId) { if (rxAnchorId.is()) diff --git a/sd/source/ui/inc/ViewShellManager.hxx b/sd/source/ui/inc/ViewShellManager.hxx index f4ba3467e647..fd3f734c1412 100644 --- a/sd/source/ui/inc/ViewShellManager.hxx +++ b/sd/source/ui/inc/ViewShellManager.hxx @@ -129,13 +129,6 @@ public: */ void DeactivateSubShell (const ViewShell& rParentShell, ShellId nId); - /** Move the specified sub shells to the top position among the sub - shells of the parent view shell. The rest of the SFX shell stack - does not change (but the all shells above the sub shells have to be - taken once off the stack and are then moved back on again.) - */ - void MoveSubShellToTop (const ViewShell& rParentShell, ShellId nId); - /** Send all sub shells of the specified view shell an Invalidate() call. This does not modify the shell stack. */ diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx index 33e88c94c616..b4778dc32810 100644 --- a/sd/source/ui/inc/framework/FrameworkHelper.hxx +++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx @@ -304,16 +304,6 @@ public: const OUString& rsResourceURL, const OUString& rsAnchorURL); - /** Create a new XResourceId object for the given resource URL and the - two given anchor URLs. - */ - static cssu::Reference< - cssdf::XResourceId> - CreateResourceId ( - const OUString& rsResourceURL, - const OUString& rsFirstAnchorURL, - const OUString& rsSecondAnchorURL); - /** Create a new XResourceId object for the given resource URL. */ static cssu::Reference< diff --git a/sd/source/ui/sidebar/AllMasterPagesSelector.cxx b/sd/source/ui/sidebar/AllMasterPagesSelector.cxx index 6e83aa23768b..1b74b8f16c66 100644 --- a/sd/source/ui/sidebar/AllMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/AllMasterPagesSelector.cxx @@ -20,7 +20,6 @@ #include "AllMasterPagesSelector.hxx" #include "PreviewValueSet.hxx" #include "ViewShellBase.hxx" -#include "SidebarShellManager.hxx" #include "MasterPageContainer.hxx" #include "MasterPageDescriptor.hxx" #include "app.hrc" diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx index dfe4b7c5b073..2295bc90a998 100644 --- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx @@ -20,7 +20,6 @@ #include "CurrentMasterPagesSelector.hxx" #include "PreviewValueSet.hxx" #include "ViewShellBase.hxx" -#include "SidebarShellManager.hxx" #include "DrawViewShell.hxx" #include "drawdoc.hxx" #include "sdpage.hxx" diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index be13bda0fdeb..ea5ad828ba7d 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -19,7 +19,6 @@ #include "LayoutMenu.hxx" -#include "SidebarShellManager.hxx" #include "app.hrc" #include "drawdoc.hxx" #include "framework/FrameworkHelper.hxx" diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx b/sd/source/ui/sidebar/LayoutMenu.hxx index b61550fc3adc..e35e3c9a7ada 100644 --- a/sd/source/ui/sidebar/LayoutMenu.hxx +++ b/sd/source/ui/sidebar/LayoutMenu.hxx @@ -58,7 +58,6 @@ namespace sd { namespace sidebar { class ControlFactory; class SidebarViewShell; -class SidebarShellManager; class LayoutMenu diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx index 38b9b5cf534c..783d4ed2b5fa 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx @@ -21,7 +21,6 @@ #include "MasterPageContainer.hxx" #include "DocumentHelper.hxx" -#include "SidebarShellManager.hxx" #include "pres.hxx" #include "drawdoc.hxx" #include "DrawDocShell.hxx" diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx index 83e8091a66e7..1c5b085cdcde 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx @@ -49,7 +49,6 @@ class ViewShellBase; namespace sd { namespace sidebar { class PreviewValueSet; -class SidebarShellManager; /** Base class of a menu that lets the user select from a list of diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx index 29ed781e30d5..6bf653058c87 100644 --- a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx @@ -23,7 +23,6 @@ #include "RecentlyUsedMasterPages.hxx" #include "MasterPageContainerProviders.hxx" #include "MasterPageObserver.hxx" -#include "SidebarShellManager.hxx" #include "sdpage.hxx" #include "drawdoc.hxx" #include "app.hrc" diff --git a/sd/source/ui/sidebar/SidebarShellManager.cxx b/sd/source/ui/sidebar/SidebarShellManager.cxx deleted file mode 100644 index 526389e42a8e..000000000000 --- a/sd/source/ui/sidebar/SidebarShellManager.cxx +++ /dev/null @@ -1,176 +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 "TaskPaneShellManager.hxx" - -#include "SidebarShellManager.hxx" -#include "ViewShellManager.hxx" -#include <tools/diagnose_ex.h> -#include <vcl/window.hxx> - -#include <algorithm> - -namespace sd { namespace sidebar { - -SidebarShellManager::SidebarShellManager ( - const ::boost::shared_ptr<ViewShellManager>& rpViewShellManager, - const ViewShell& rViewShell) - : mpViewShellManager(rpViewShellManager), - mrViewShell(rViewShell), - maSubShells() -{ -} - - - - -SidebarShellManager::~SidebarShellManager (void) -{ - while ( ! maSubShells.empty()) - RemoveSubShell(maSubShells.begin()->second.mpShell); -} - - - - -SfxShell* SidebarShellManager::CreateShell( ShellId nId, ::Window* , FrameView* ) -{ - SubShells::const_iterator iShell (maSubShells.find(nId)); - if (iShell != maSubShells.end()) - return iShell->second.mpShell; - else - return NULL; -} - - - - -void SidebarShellManager::ReleaseShell (SfxShell* ) -{ - // Nothing to do. -} - -void SidebarShellManager::AddSubShell ( - ShellId nId, - SfxShell* pShell, - ::Window* pWindow) -{ - if (pShell != NULL) - { - maSubShells[nId] = ShellDescriptor(pShell,pWindow); - if (pWindow != NULL) - { - pWindow->AddEventListener(LINK(this,SidebarShellManager,WindowCallback)); - if (pWindow->IsReallyVisible()) - mpViewShellManager->ActivateSubShell(mrViewShell, nId); - } - else - mpViewShellManager->ActivateSubShell(mrViewShell, nId); - } -} - - - - -void SidebarShellManager::RemoveSubShell (const ShellId i_nShellId) -{ - SubShells::iterator pos = maSubShells.find( i_nShellId ); - ENSURE_OR_RETURN_VOID( pos != maSubShells.end(), "no shell for this ID" ); - if ( pos->second.mpWindow != NULL ) - { - pos->second.mpWindow->RemoveEventListener( LINK( this, SidebarShellManager, WindowCallback ) ); - } - mpViewShellManager->DeactivateSubShell( mrViewShell, pos->first ); - maSubShells.erase( pos ); -} - - - - -void SidebarShellManager::RemoveSubShell (const SfxShell* pShell) -{ - if (pShell != NULL) - { - SubShells::iterator iShell; - for (iShell=maSubShells.begin(); iShell!=maSubShells.end(); ++iShell) - if (iShell->second.mpShell == pShell) - { - if (iShell->second.mpWindow != NULL) - iShell->second.mpWindow->RemoveEventListener( - LINK(this,SidebarShellManager,WindowCallback)); - mpViewShellManager->DeactivateSubShell(mrViewShell,iShell->first); - maSubShells.erase(iShell); - break; - } - } -} - - - - -void SidebarShellManager::MoveToTop (SfxShell* pShell) -{ - SubShells::const_iterator iShell; - for (iShell=maSubShells.begin(); iShell!=maSubShells.end(); ++iShell) - if (iShell->second.mpShell == pShell) - { - ViewShellManager::UpdateLock aLocker (mpViewShellManager); - mpViewShellManager->MoveSubShellToTop(mrViewShell,iShell->first); - mpViewShellManager->MoveToTop(mrViewShell); - break; - } -} - - - - -IMPL_LINK(SidebarShellManager, WindowCallback, VclWindowEvent*, pEvent) -{ - if (pEvent != NULL) - { - SubShells::const_iterator iShell; - ::Window* pWindow = pEvent->GetWindow(); - for (iShell=maSubShells.begin(); iShell!=maSubShells.end(); ++iShell) - if (iShell->second.mpWindow == pWindow) - break; - if (iShell != maSubShells.end()) - switch (pEvent->GetId()) - { - case VCLEVENT_WINDOW_SHOW: - mpViewShellManager->ActivateSubShell(mrViewShell,iShell->first); - break; - - case VCLEVENT_WINDOW_HIDE: - // Do not activate the sub shell. This leads to - // problems with shapes currently being in text edit - // mode: Deactivating the shell leads to leaving the - // text editing mode. - // mpViewShellManager->DeactivateSubShell(mrViewShell,iShell->first); - break; - } - } - - return 0; -} - - -} } // end of namespace ::sd::sidebar - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/sidebar/SidebarShellManager.hxx b/sd/source/ui/sidebar/SidebarShellManager.hxx deleted file mode 100644 index eec84c60620d..000000000000 --- a/sd/source/ui/sidebar/SidebarShellManager.hxx +++ /dev/null @@ -1,116 +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 . - */ - -#ifndef SD_SIDEBAR_SHELL_MANAGER_HXX -#define SD_SIDEBAR_SHELL_MANAGER_HXX - -#include "ShellFactory.hxx" -#include "ViewShellManager.hxx" -#include <tools/link.hxx> -#include <map> - -class FrameView; -class SfxShell; -class VclWindowEvent; -class Window; - -namespace sd { -class ViewShell; -} - -namespace sd { namespace sidebar { - -/** The TaskPaneShellManager implements the ViewShellManager::ShellFactory - interface. However, it does not create or delete shells. It only - gives the ViewShellManager access to the sub shells of the - ToolPanelViewShell. Life time control of the sub shells is managed by - the sub shells themselves. -*/ -class SidebarShellManager - : public ShellFactory<SfxShell> -{ -public: - /** Create a shell manager that manages the stacked shells for the given - view shell. It works together with the given view shell manager. - */ - SidebarShellManager ( - const ::boost::shared_ptr<ViewShellManager>& rpViewShellManager, - const ViewShell& rViewShell); - ~SidebarShellManager (void); - - /** Return the requested sub shell. - @param nId - The id of the requested sub shell. - @return - When there is no sub shell currently registered under the given - id then NULL is returned. - */ - virtual SfxShell* CreateShell ( - ShellId nId, - ::Window* pParentWindow, - FrameView* pFrameView = NULL); - - virtual void ReleaseShell (SfxShell* pShell); - - /** Add a sub shell to the set of sub shells managed by the - TaskPaneShellManager. Only shells added by this method are returned - by CreateShell(). - */ - void AddSubShell (ShellId nId, SfxShell* pShell, ::Window* pWindow); - - /** Remove the given shell from the set of sub shells managed by the - TaskPaneShellManager. Following calls to CreateShell() will return - NULL when this shell is requested. - */ - void RemoveSubShell (const SfxShell* pShell); - /** removes the shell given by its ID from the set of sub shells managed by the - TaskPaneShellManager. Subsequent calls to CreateShell() will return - NULL when this shell is requested. - */ - void RemoveSubShell (const ShellId i_nShellId); - - /** Move the given sub-shell to the top of the local shell stack. - Furthermore move the view shell whose sub-shells this class manages - to the top of the global shell stack. - */ - void MoveToTop (SfxShell* pShell); - - DECL_LINK(WindowCallback,VclWindowEvent*); - -private: - ::boost::shared_ptr<ViewShellManager> mpViewShellManager; - - /// The view shell whose sub-shells this class manages. - const ViewShell& mrViewShell; - - class ShellDescriptor { public: - SfxShell* mpShell; - ::Window* mpWindow; - ShellDescriptor(void) : mpShell(NULL),mpWindow(NULL){} - ShellDescriptor(SfxShell*pShell,::Window*pWindow) : mpShell(pShell),mpWindow(pWindow){} - }; - typedef ::std::map<ShellId,ShellDescriptor> SubShells; - SubShells maSubShells; -}; - -} } // end of namespace ::sd::sidebar - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx index 093e6e90e6ba..bfb8ef893439 100644 --- a/sd/source/ui/view/ViewShellManager.cxx +++ b/sd/source/ui/view/ViewShellManager.cxx @@ -123,7 +123,6 @@ public: void SetFormShell (const ViewShell* pViewShell, FmFormShell* pFormShell, bool bAbove); void ActivateSubShell (const SfxShell& rParentShell, ShellId nId); void DeactivateSubShell (const SfxShell& rParentShell, ShellId nId); - void MoveSubShellToTop (const SfxShell& rParentShell, ShellId nId); void MoveToTop (const SfxShell& rParentShell); SfxShell* GetShell (ShellId nId) const; SfxShell* GetTopShell (void) const; @@ -302,17 +301,6 @@ void ViewShellManager::DeactivateViewShell (const ViewShell* pShell) -void ViewShellManager::MoveSubShellToTop ( - const ViewShell& rParentShell, - ShellId nId) -{ - if (mbValid) - mpImpl->MoveSubShellToTop(rParentShell, nId); -} - - - - void ViewShellManager::SetFormShell ( const ViewShell* pParentShell, FmFormShell* pFormShell, @@ -709,34 +697,6 @@ void ViewShellManager::Implementation::DeactivateSubShell ( -void ViewShellManager::Implementation::MoveSubShellToTop ( - const SfxShell& rParentShell, - ShellId nId) -{ - SubShellList::iterator iList (maActiveSubShells.find(&rParentShell)); - if (iList != maActiveSubShells.end()) - { - // Look up the sub shell. - SubShellSubList& rList (iList->second); - SubShellSubList::iterator iShell ( - ::std::find_if(rList.begin(),rList.end(), IsId(nId))); - if (iShell!=rList.end() && iShell!=rList.begin()) - { - SubShellSubList::value_type aEntry (*iShell); - rList.erase(iShell); - rList.push_front(aEntry); - } - } - else - { - // Ignore this call when there are no sub shells for the given - // parent shell. We could remember the sub shell to move to the top - // but we do not. Do call this method at a later time instead. - } -} - - - void ViewShellManager::Implementation::MoveToTop (const SfxShell& rShell) { ::osl::MutexGuard aGuard (maMutex); diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx index 98d7ca768007..42d9c3a1ed94 100644 --- a/sfx2/source/dialog/taskpane.cxx +++ b/sfx2/source/dialog/taskpane.cxx @@ -731,14 +731,6 @@ namespace sfx2 } //------------------------------------------------------------------------------------------------------------------ - ModuleTaskPane::ModuleTaskPane( Window& i_rParentWindow, const Reference< XFrame >& i_rDocumentFrame, - const IToolPanelCompare& i_rCompare ) - :Window( &i_rParentWindow, WB_DIALOGCONTROL ) - ,m_pImpl( new ModuleTaskPane_Impl( *this, i_rDocumentFrame, &i_rCompare ) ) - { - } - - //------------------------------------------------------------------------------------------------------------------ ModuleTaskPane::~ModuleTaskPane() { } @@ -782,12 +774,6 @@ namespace sfx2 } //------------------------------------------------------------------------------------------------------------------ - OUString ModuleTaskPane::GetPanelResourceURL( const size_t i_nPanelPos ) const - { - return m_pImpl->GetPanelResourceURL( i_nPanelPos ); - } - - //------------------------------------------------------------------------------------------------------------------ void ModuleTaskPane::SetDrawersLayout() { m_pImpl->SetDrawersLayout(); diff --git a/sfx2/source/sidebar/Sidebar.cxx b/sfx2/source/sidebar/Sidebar.cxx index dd7efec0550a..a7ef2ccfb805 100644 --- a/sfx2/source/sidebar/Sidebar.cxx +++ b/sfx2/source/sidebar/Sidebar.cxx @@ -47,18 +47,6 @@ void Sidebar::ShowPanel ( } } - - - -void Sidebar::ShowDeck ( - const ::rtl::OUString& rsDeckId, - const Reference<frame::XFrame>& rxFrame) -{ - SidebarController* pController = SidebarController::GetSidebarControllerForFrame(rxFrame); - if (pController != NULL) - pController->RequestSwitchToDeck(rsDeckId); -} - } } // end of namespace sfx2::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx index 952437b62df8..3e5d873f9c5e 100644 --- a/svx/source/dialog/rulritem.cxx +++ b/svx/source/dialog/rulritem.cxx @@ -648,21 +648,11 @@ void SvxColumnItem::SetRight(long right) nRight = right; } -void SvxColumnItem::SetActColumn(sal_uInt16 nCol) -{ - nActColumn = nCol; -} - sal_uInt16 SvxColumnItem::GetActColumn() const { return nActColumn; } -sal_uInt16 SvxColumnItem::GetColumnDescription() const -{ - return nActColumn; -} - sal_Bool SvxColumnItem::IsFirstAct() const { return nActColumn == 0; @@ -747,11 +737,6 @@ void SvxColumnItem::SetOrtho(sal_Bool bVal) bOrtho = bVal; } -sal_Bool SvxColumnItem::IsOrtho () const -{ - return sal_False; -} - sal_Bool SvxColumnItem::IsConsistent() const { return nActColumn < aColumns.size(); diff --git a/unusedcode.easy b/unusedcode.easy index f736e9dc410b..d4daf9cbb6f8 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -11,6 +11,10 @@ EditTextObjectImpl::SetParaAttribs(int, SfxItemSet const&) FontSelectPatternAttributes::FontSelectPatternAttributes(PhysicalFontFace const&, Size const&, float, int, bool) ImplRegionBand::IsInside(long, long) ImplRegionBand::IsOver(long, long) +LanguageTag::LanguageTag() +LanguageTag::convertLangToBcp47() +LanguageTag::convertLocaleToBcp47() +LanguageTag::getRegion() const LanguageTag::reset(_rtl_Locale const&) OutputDevice::GetCanvas() const OutputDevice::LogicToLogic(basegfx::B2DPolyPolygon const&, MapMode const&, MapMode const&) @@ -38,7 +42,6 @@ ScDBQueryDataIterator::DataAccessInternal::setPos(unsigned long) ScDPFilteredCache::SingleFilter::getMatchValue() const ScDocument::GetCellCount(short, short) const ScDocument::GetFormulaTokens(ScAddress const&) const -ScDocument::GetStringCell(ScAddress const&) const ScDocument::IsEmptyData(short, short) const ScDocumentImport::setFormulaCell(ScAddress const&, ScTokenArray const&) ScEditUtil::GetSpaceDelimitedString(EditTextObject const&) @@ -48,6 +51,8 @@ ScGlobal::GetStandardFormat(double, SvNumberFormatter&, unsigned long, short) ScMyNotEmptyCellsIterator::GetCell() const ScRangeStringConverter::GetRangeListFromString(com::sun::star::uno::Sequence<com::sun::star::table::CellRangeAddress>&, rtl::OUString const&, ScDocument const*, formula::FormulaGrammar::AddressConvention, unsigned short, unsigned short) ScRefCellValue::commit(ScColumn&, int) const +ScSimpleRefDlgWrapper::GetRefString() +ScTable::SetRawString(short, int, rtl::OUString const&) ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent() ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any const&) ServerFont::GetGlyphBitmap1(int, RawBitmap&) const @@ -57,6 +62,12 @@ SfxGrabBagItem::SetGrabBag(std::__debug::map<rtl::OUString, com::sun::star::uno: SfxTemplatePanelControl::SetParagraphFamily() SmFontPickList::Contains(Font const&) const SmParser::Insert(rtl::OUString const&, int) +String::Append(unsigned short const*) +String::Append(unsigned short const*, unsigned short) +String::Assign(unsigned short const*) +String::Insert(String const&, unsigned short, unsigned short, unsigned short) +String::SearchAscii(char const*, unsigned short) const +String::String(char) SvdProgressInfo::ReportError() SvpSalInstance::PostEvent(SalFrame const*, void*, unsigned short) SvpSalInstance::PostedEventsInQueue() @@ -96,7 +107,6 @@ apitest::XPropertySet::testRemoveVetoableChangeListener() apitest::XSheetOutline::testAutoOutline() apitest::XSpreadsheetDocument::testGetSheets() apitest::XText::testInsertRemoveTextContent() -basebmp::BitmapDevice::getBufferSize() const basebmp::createBitmapDevice(basegfx::B2IVector const&, bool, basebmp::Format, boost::shared_array<unsigned char> const&, boost::shared_ptr<std::__debug::vector<basebmp::Color, std::allocator<basebmp::Color> > const> const&) basebmp::createBitmapDevice(basegfx::B2IVector const&, bool, basebmp::Format, boost::shared_ptr<std::__debug::vector<basebmp::Color, std::allocator<basebmp::Color> > const> const&) basegfx::snapToNearestMultiple(double, double) @@ -120,10 +130,13 @@ drawinglayer::attribute::SdrFillGraphicAttribute::getLogSize() const editeng::MisspellRange::MisspellRange() editeng::Section::Section() formula::FormulaDlg::CheckMatrix() +formula::FormulaTokenArray::AddString(unsigned short const*) formula::SingleVectorRefToken::SingleVectorRefToken(double const*, unsigned long) framework::MenuBarManager::getComponentContext() framework::MenuManager::getContext() -jfw_plugin::VendorBase::createInstance() +linguistic::LinguIsUnspecified(rtl::OUString const&) +oglcanvas::CanvasHelper::flush() const +oglcanvas::TextLayout::draw(com::sun::star::rendering::ViewState const&, com::sun::star::rendering::RenderState const&, com::sun::star::uno::Reference<com::sun::star::rendering::XGraphicDevice> const&) const oox::core::Decrypt::aes128cbc(std::__debug::vector<unsigned char, std::allocator<unsigned char> >&, std::__debug::vector<unsigned char, std::allocator<unsigned char> >&, std::__debug::vector<unsigned char, std::allocator<unsigned char> >&, std::__debug::vector<unsigned char, std::allocator<unsigned char> >&) oox::drawingml::TextListStyle::dump() const oox::xls::BiffDrawingObjectBase::BiffDrawingObjectBase(oox::xls::WorksheetHelper const&) @@ -132,20 +145,29 @@ oox::xls::WorksheetGlobals::getRows(oox::ValueRange const&) const rtl_OUString::convertFromString::test() sc::CellTextAttr::CellTextAttr(unsigned short, unsigned char) sc::ColumnSet::has(short, short) const +sc::opencl::OclCalc::mapAndCopyArithmetic32Bits(double const*, int) +sc::opencl::OclCalc::mapAndCopyArithmetic64Bits(double const*, int) +sc::opencl::OclCalc::oclHostFormulaCount32Bits(unsigned int*, unsigned int*, double*, int) +sc::opencl::OclCalc::oclHostFormulaCount64Bits(unsigned int*, unsigned int*, double*&, int) +sc::opencl::OclCalc::oclHostFormulaSumProduct32Bits(float*, float*, unsigned int*, double*, int) +sc::opencl::OclCalc::oclHostFormulaSumProduct64Bits(double*, double*, unsigned int*, double*&, int) +sc::opencl::OclCalc::oclSimpleDeltaOperation(OpCodeEnum, double const*, double const*, unsigned long, double) +sc::opencl::OpenclDevice::releaseOpenclRunEnv() +sc::opencl::OpenclDevice::setOpenclState(int) +sc::opencl::getTimeDiff(TimeValue const&, TimeValue const&) sc::sidebar::CellLineStyleValueSet::SetImage(Image) sc_apitest::main() sd::LeftDrawPaneShell::RegisterInterface(SfxModule*) sd::LeftImpressPaneShell::RegisterInterface(SfxModule*) -sd::ToolPanelPaneShell::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() sd::sidebar::LayoutMenu::GetPreferredSize() sd::sidebar::LayoutMenu::GetPreferredWidth(int) sdr::overlay::OverlayRectangle::setSecondPosition(basegfx::B2DPoint const&) sdr::table::SdrTableObj::getRowCount() const -sfx2::sidebar::AsynchronousCall::RequestCall(boost::function<void ()> const&) sfx2::sidebar::Context::EvaluateMatch(std::__debug::vector<sfx2::sidebar::Context, std::allocator<sfx2::sidebar::Context> > const&) const sfx2::sidebar::ContextList::IsEmpty() sfx2::sidebar::Deck::PrintWindowTree(std::__debug::vector<sfx2::sidebar::Panel*, std::allocator<sfx2::sidebar::Panel*> > const&) @@ -155,13 +177,49 @@ sfx2::sidebar::EnumContext::GetCombinedContext() const sfx2::sidebar::Paint::Set(sfx2::sidebar::Paint const&) sfx2::sidebar::Panel::PrintWindowTree() sfx2::sidebar::SidebarDockingWindow::GetChildWindow() +sfx2::sidebar::TabBar::GetItemForId(rtl::OUString const&) std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> >, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> > >::_Rb_tree(std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> >, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> > >&&) std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr<formula::FormulaTokenArray>&) std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr_ref<formula::FormulaTokenArray>) +svl::SharedStringPool::SharedStringPool() +svt::ToolPanelDeck::SetAccessibleParentWindow(Window*) svx::DialControl::GetModifyHdl() const svx::sidebar::LineWidthControl::GetValueSet() -unoidl::SourceProvider::SourceProvider(rtl::Reference<unoidl::Manager> const&, rtl::OUString const&) -unoidl::UnoidlProvider::getConstant(unsigned int) const +test::BootstrapFixtureBase::getPathFromWorkdir(char const*) utl::toISO8601(com::sun::star::util::Time const&) vclmain::createApplication() +writerfilter::doctok::CpAndFc::CpAndFc(writerfilter::doctok::Cp const&, writerfilter::doctok::Fc const&, writerfilter::doctok::PropertyType) +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::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::WW8PICF::get_DffRecord() +writerfilter::doctok::WW8PICF::get_ffdata() +writerfilter::doctok::WW8PICF::init() +writerfilter::doctok::WW8SED::init() +writerfilter::doctok::WW8SttbRgtplc::init() +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::ooxml::OOXMLFastContextHandler::mark(unsigned int const&, boost::shared_ptr<writerfilter::ooxml::OOXMLValue>) diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk index 797c1939a903..3e54241f99ef 100644 --- a/writerfilter/Library_writerfilter.mk +++ b/writerfilter/Library_writerfilter.mk @@ -124,7 +124,6 @@ $(eval $(call gb_Library_add_exception_objects,writerfilter,\ writerfilter/source/doctok/Dff \ writerfilter/source/doctok/DffImpl \ writerfilter/source/doctok/WW8Annotation \ - writerfilter/source/doctok/WW8Clx \ writerfilter/source/doctok/WW8CpAndFc \ writerfilter/source/doctok/WW8FKPImpl \ writerfilter/source/doctok/WW8FontTable \ diff --git a/writerfilter/source/doctok/WW8Clx.cxx b/writerfilter/source/doctok/WW8Clx.cxx deleted file mode 100644 index bea2d554d869..000000000000 --- a/writerfilter/source/doctok/WW8Clx.cxx +++ /dev/null @@ -1,78 +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 <com/sun/star/io/XSeekable.hpp> -#include <WW8Clx.hxx> -#include <doctok/resources.hxx> - -namespace writerfilter { -namespace doctok -{ -WW8Clx::WW8Clx(WW8Stream & rStream, - sal_uInt32 nOffset, sal_uInt32 nCount) -: WW8StructBase(rStream, nOffset, nCount), nOffsetPieceTable(0) -{ - while (getU8(nOffsetPieceTable) != 2) - { - nOffsetPieceTable += getU16(nOffsetPieceTable + 1) + 3; - } -} - -sal_uInt32 WW8Clx::getPieceCount() const -{ - return (getU32(nOffsetPieceTable + 1) - 4) / 12; -} - -sal_uInt32 WW8Clx::getCp(sal_uInt32 nIndex) const -{ - return getU32(nOffsetPieceTable + 5 + nIndex * 4); -} - -sal_uInt32 WW8Clx::getFc(sal_uInt32 nIndex) const -{ - sal_uInt32 nResult = getU32(nOffsetPieceTable + 5 + - (getPieceCount() + 1) * 4 + - nIndex * 8 + 2); - - if (nResult & 0x40000000) - nResult = (nResult & ~0x40000000) / 2; - - return nResult; -} - -sal_Bool WW8Clx::isComplexFc(sal_uInt32 nIndex) const -{ - sal_Bool bResult = sal_False; - sal_uInt32 nTmp = getU32(nOffsetPieceTable + 5 + - (getPieceCount() + 1) * 4 + - nIndex * 8 + 2); - if (nTmp & 0x40000000) - bResult = sal_True; - - return bResult; -} - -void WW8Clx::dump(OutputWithDepth<string> & o) const -{ - WW8StructBase::dump(o); -} - -}} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/doctok/WW8Clx.hxx b/writerfilter/source/doctok/WW8Clx.hxx deleted file mode 100644 index b15c5e21a7d2..000000000000 --- a/writerfilter/source/doctok/WW8Clx.hxx +++ /dev/null @@ -1,83 +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 . - */ - -#ifndef INCLUDED_WW8_CLX_HXX -#define INCLUDED_WW8_CLX_HXX - -#include <doctok/resources.hxx> - -namespace writerfilter { -namespace doctok -{ - -/** - Piece table as stored in a Word file. - - It contains character positions (CPs) and file character positions - (FCs). Each CP is correlated to one FC. - */ -class WW8Clx : public WW8StructBase -{ - /// Pointer to the file information block. - WW8Fib::Pointer_t pFib; - - /// Offset where FCs begin - sal_uInt32 nOffsetPieceTable; - -public: - /// Pointer to Clx. - typedef boost::shared_ptr<WW8Clx> Pointer_t; - - WW8Clx(WW8Stream & rStream, - sal_uInt32 nOffset, sal_uInt32 nCount); - - virtual void dump(OutputWithDepth<string> & o) const; - - /** - Return the number of pieces. - */ - sal_uInt32 getPieceCount() const; - - /** - Return a certain character position. - - @param nIndex index of the character position - */ - sal_uInt32 getCp(sal_uInt32 nIndex) const; - - /** - Return a certain file character position. - - @param nIndex index of the file character position - */ - sal_uInt32 getFc(sal_uInt32 nIndex) const; - - /** - Return if a certain FC is complex. - - @nIndex index of the FC - */ - sal_Bool isComplexFc(sal_uInt32 nIndex) const; - -}; -}} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |