diff options
| author | gamebusterz <gamebusterz2@gmail.com> | 2015-02-20 02:46:58 +0530 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-02-20 21:25:17 +0000 |
| commit | 5bd8dcd45cb37b093e526c929ff9e3f382b8a758 (patch) | |
| tree | e9e93b53d509a04a1548b6da8cca868a5351964b | |
| parent | 1fcaf8a37a7133f07e5b9a18c4fadf17fe914f6d (diff) | |
tdf#12345 Removed redundant newlines in the code
Change-Id: Id3d8b6732caf58c70315db6e706338f7dac458c2
Reviewed-on: https://gerrit.libreoffice.org/14567
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
30 files changed, 2 insertions, 537 deletions
diff --git a/sfx2/source/sidebar/Accessible.cxx b/sfx2/source/sidebar/Accessible.cxx index a3659257a551..5a309cac4991 100644 --- a/sfx2/source/sidebar/Accessible.cxx +++ b/sfx2/source/sidebar/Accessible.cxx @@ -35,15 +35,11 @@ Accessible::Accessible ( } - - Accessible::~Accessible (void) { } - - void SAL_CALL Accessible::disposing (void) { Reference<XComponent> xComponent (mxContext, UNO_QUERY); @@ -52,8 +48,6 @@ void SAL_CALL Accessible::disposing (void) } - - Reference<accessibility::XAccessibleContext> SAL_CALL Accessible::getAccessibleContext (void) throw (css::uno::RuntimeException, std::exception) { diff --git a/sfx2/source/sidebar/AccessibleTitleBar.cxx b/sfx2/source/sidebar/AccessibleTitleBar.cxx index 3fd70960ce78..110c6af5afde 100644 --- a/sfx2/source/sidebar/AccessibleTitleBar.cxx +++ b/sfx2/source/sidebar/AccessibleTitleBar.cxx @@ -22,6 +22,7 @@ #include "TitleBar.hxx" #include <com/sun/star/accessibility/AccessibleStateType.hpp> + #include <unotools/accessiblestatesethelper.hxx> using namespace css; @@ -29,7 +30,6 @@ using namespace css::uno; namespace sfx2 { namespace sidebar { - Reference<accessibility::XAccessible> AccessibleTitleBar::Create (TitleBar& rTitleBar) { rTitleBar.GetComponentInterface(true); @@ -41,23 +41,17 @@ Reference<accessibility::XAccessible> AccessibleTitleBar::Create (TitleBar& rTit } - - AccessibleTitleBar::AccessibleTitleBar (VCLXWindow* pWindow) : VCLXAccessibleComponent(pWindow) { } - - AccessibleTitleBar::~AccessibleTitleBar (void) { } - - void AccessibleTitleBar::FillAccessibleStateSet (utl::AccessibleStateSetHelper& rStateSet) { VCLXAccessibleComponent::FillAccessibleStateSet(rStateSet); diff --git a/sfx2/source/sidebar/AsynchronousCall.cxx b/sfx2/source/sidebar/AsynchronousCall.cxx index bdd530a5dd5c..d7ffa6251675 100644 --- a/sfx2/source/sidebar/AsynchronousCall.cxx +++ b/sfx2/source/sidebar/AsynchronousCall.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include "AsynchronousCall.hxx" - #include <vcl/svapp.hxx> diff --git a/sfx2/source/sidebar/CommandInfoProvider.cxx b/sfx2/source/sidebar/CommandInfoProvider.cxx index 0f0d957527de..6b005ff92280 100644 --- a/sfx2/source/sidebar/CommandInfoProvider.cxx +++ b/sfx2/source/sidebar/CommandInfoProvider.cxx @@ -76,7 +76,6 @@ namespace } - namespace sfx2 { namespace sidebar { CommandInfoProvider& CommandInfoProvider::Instance (void) @@ -86,8 +85,6 @@ CommandInfoProvider& CommandInfoProvider::Instance (void) } - - CommandInfoProvider::CommandInfoProvider (void) : mxContext(comphelper::getProcessComponentContext()), mxCachedDataFrame(), @@ -100,8 +97,6 @@ CommandInfoProvider::CommandInfoProvider (void) } - - CommandInfoProvider::~CommandInfoProvider (void) { if (mxFrameListener.is()) @@ -112,8 +107,6 @@ CommandInfoProvider::~CommandInfoProvider (void) } - - OUString CommandInfoProvider::GetLabelForCommand ( const OUString& rsCommandName, const Reference<frame::XFrame>& rxFrame) @@ -129,8 +122,6 @@ OUString CommandInfoProvider::GetLabelForCommand ( } - - void CommandInfoProvider::SetFrame (const Reference<frame::XFrame>& rxFrame) { if (rxFrame != mxCachedDataFrame) @@ -155,8 +146,6 @@ void CommandInfoProvider::SetFrame (const Reference<frame::XFrame>& rxFrame) } - - Reference<ui::XAcceleratorConfiguration> CommandInfoProvider::GetDocumentAcceleratorConfiguration (void) { if ( ! mxCachedDocumentAcceleratorConfiguration.is()) @@ -189,8 +178,6 @@ Reference<ui::XAcceleratorConfiguration> CommandInfoProvider::GetDocumentAcceler } - - Reference<ui::XAcceleratorConfiguration> CommandInfoProvider::GetModuleAcceleratorConfiguration (void) { if ( ! mxCachedModuleAcceleratorConfiguration.is()) @@ -213,8 +200,6 @@ Reference<ui::XAcceleratorConfiguration> CommandInfoProvider::GetModuleAccelerat } - - Reference<ui::XAcceleratorConfiguration> CommandInfoProvider::GetGlobalAcceleratorConfiguration (void) { // Get the global accelerator configuration. @@ -227,8 +212,6 @@ Reference<ui::XAcceleratorConfiguration> CommandInfoProvider::GetGlobalAccelerat } - - OUString CommandInfoProvider::GetModuleIdentifier (void) { if (msCachedModuleIdentifier.getLength() == 0) @@ -240,8 +223,6 @@ OUString CommandInfoProvider::GetModuleIdentifier (void) } - - OUString CommandInfoProvider::GetCommandShortcut (const OUString& rsCommandName) { OUString sShortcut; @@ -262,8 +243,6 @@ OUString CommandInfoProvider::GetCommandShortcut (const OUString& rsCommandName) } - - OUString CommandInfoProvider::RetrieveShortcutsFromConfiguration( const Reference<ui::XAcceleratorConfiguration>& rxConfiguration, const OUString& rsCommandName) @@ -293,8 +272,6 @@ OUString CommandInfoProvider::RetrieveShortcutsFromConfiguration( } - - Sequence<beans::PropertyValue> CommandInfoProvider::GetCommandProperties (const OUString& rsCommandName) { Sequence<beans::PropertyValue> aProperties; @@ -318,8 +295,6 @@ Sequence<beans::PropertyValue> CommandInfoProvider::GetCommandProperties (const } - - OUString CommandInfoProvider::GetCommandLabel (const OUString& rsCommandName) { const Sequence<beans::PropertyValue> aProperties (GetCommandProperties(rsCommandName)); diff --git a/sfx2/source/sidebar/Context.cxx b/sfx2/source/sidebar/Context.cxx index ab6dadfe29f4..3639be1f112b 100644 --- a/sfx2/source/sidebar/Context.cxx +++ b/sfx2/source/sidebar/Context.cxx @@ -35,8 +35,6 @@ Context::Context (void) } - - Context::Context ( const ::rtl::OUString& rsApplication, const ::rtl::OUString& rsContext) @@ -46,8 +44,6 @@ Context::Context ( } - - sal_Int32 Context::EvaluateMatch ( const Context& rOther) const { @@ -68,10 +64,6 @@ sal_Int32 Context::EvaluateMatch ( - - - - bool Context::operator== (const Context& rOther) const { return msApplication.equals(rOther.msApplication) @@ -79,8 +71,6 @@ bool Context::operator== (const Context& rOther) const } - - bool Context::operator!= (const Context& rOther) const { return ( ! msApplication.equals(rOther.msApplication)) diff --git a/sfx2/source/sidebar/ContextChangeBroadcaster.cxx b/sfx2/source/sidebar/ContextChangeBroadcaster.cxx index a45a8038b779..3153a58f4295 100644 --- a/sfx2/source/sidebar/ContextChangeBroadcaster.cxx +++ b/sfx2/source/sidebar/ContextChangeBroadcaster.cxx @@ -39,22 +39,18 @@ ContextChangeBroadcaster::ContextChangeBroadcaster (void) } - ContextChangeBroadcaster::~ContextChangeBroadcaster (void) { } - void ContextChangeBroadcaster::Initialize (const ::rtl::OUString& rsContextName) { msContextName = rsContextName; } - - void ContextChangeBroadcaster::Activate (const css::uno::Reference<css::frame::XFrame>& rxFrame) { if (msContextName.getLength() > 0) @@ -62,8 +58,6 @@ void ContextChangeBroadcaster::Activate (const css::uno::Reference<css::frame::X } - - void ContextChangeBroadcaster::Deactivate (const css::uno::Reference<css::frame::XFrame>& rxFrame) { if (msContextName.getLength() > 0) @@ -76,8 +70,6 @@ void ContextChangeBroadcaster::Deactivate (const css::uno::Reference<css::frame: } - - bool ContextChangeBroadcaster::SetBroadcasterEnabled (const bool bIsEnabled) { const bool bWasEnabled (mbIsBroadcasterEnabled); @@ -86,8 +78,6 @@ bool ContextChangeBroadcaster::SetBroadcasterEnabled (const bool bIsEnabled) } - - void ContextChangeBroadcaster::BroadcastContextChange ( const css::uno::Reference<css::frame::XFrame>& rxFrame, const ::rtl::OUString& rsModuleName, @@ -119,8 +109,6 @@ void ContextChangeBroadcaster::BroadcastContextChange ( } - - OUString ContextChangeBroadcaster::GetModuleName (const css::uno::Reference<css::frame::XFrame>& rxFrame) { if ( ! rxFrame.is() || ! rxFrame->getController().is()) @@ -139,7 +127,6 @@ OUString ContextChangeBroadcaster::GetModuleName (const css::uno::Reference<css: } - } } // end of namespace ::sd::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/sidebar/ContextList.cxx b/sfx2/source/sidebar/ContextList.cxx index e1dd71169068..2a1480e0b67a 100644 --- a/sfx2/source/sidebar/ContextList.cxx +++ b/sfx2/source/sidebar/ContextList.cxx @@ -30,15 +30,11 @@ ContextList::ContextList (void) } - - ContextList::~ContextList (void) { } - - const ContextList::Entry* ContextList::GetMatch (const Context& rContext) const { const ::std::vector<Entry>::const_iterator iEntry = FindBestMatch(rContext); @@ -49,8 +45,6 @@ const ContextList::Entry* ContextList::GetMatch (const Context& rContext) const } - - ContextList::Entry* ContextList::GetMatch (const Context& rContext) { const ::std::vector<Entry>::const_iterator iEntry = FindBestMatch(rContext); @@ -61,8 +55,6 @@ ContextList::Entry* ContextList::GetMatch (const Context& rContext) } - - ::std::vector<ContextList::Entry>::const_iterator ContextList::FindBestMatch (const Context& rContext) const { sal_Int32 nBestMatch (Context::NoMatch); @@ -88,8 +80,6 @@ ContextList::Entry* ContextList::GetMatch (const Context& rContext) } - - void ContextList::AddContextDescription ( const Context& rContext, const bool bIsInitiallyVisible, @@ -102,8 +92,6 @@ void ContextList::AddContextDescription ( } - - } } // end of namespace sfx2::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/sidebar/ControllerFactory.cxx b/sfx2/source/sidebar/ControllerFactory.cxx index 16d4acaa4391..90ea9ccdf6f4 100644 --- a/sfx2/source/sidebar/ControllerFactory.cxx +++ b/sfx2/source/sidebar/ControllerFactory.cxx @@ -136,8 +136,6 @@ Reference<frame::XToolbarController> ControllerFactory::CreateToolBoxController( } - - Reference<frame::XToolbarController> ControllerFactory::CreateToolBarController( ToolBox* pToolBox, const OUString& rsCommandName, diff --git a/sfx2/source/sidebar/ControllerItem.cxx b/sfx2/source/sidebar/ControllerItem.cxx index b2cdc7245262..584507692ef9 100644 --- a/sfx2/source/sidebar/ControllerItem.cxx +++ b/sfx2/source/sidebar/ControllerItem.cxx @@ -104,8 +104,6 @@ ControllerItem::ControllerItem ( } - - ControllerItem::ControllerItem ( const sal_uInt16 nSlotId, SfxBindings &rBindings, @@ -121,8 +119,6 @@ ControllerItem::ControllerItem ( } - - ControllerItem::~ControllerItem (void) { if (mxFrameActionListener.is()) @@ -168,8 +164,6 @@ bool ControllerItem::IsEnabled (SfxItemState eState) const } - - void ControllerItem::RequestUpdate (void) { SfxPoolItem* pState = NULL; @@ -178,16 +172,12 @@ void ControllerItem::RequestUpdate (void) } - - void ControllerItem::NotifyFrameContextChange (void) { RequestUpdate(); } - - void ControllerItem::ResetFrame (void) { mxFrame = NULL; @@ -195,7 +185,6 @@ void ControllerItem::ResetFrame (void) - ::rtl::OUString ControllerItem::GetLabel (void) const { return CommandInfoProvider::Instance().GetLabelForCommand( @@ -204,8 +193,6 @@ void ControllerItem::ResetFrame (void) } - - ::rtl::OUString ControllerItem::GetHelpText (void) const { Help* pHelp = Application::GetHelp(); @@ -222,15 +209,12 @@ void ControllerItem::ResetFrame (void) - Image ControllerItem::GetIcon (void) const { return GetImage(mxFrame, ".uno:" + msCommandName, false); } - - ControllerItem::ItemUpdateReceiverInterface::~ItemUpdateReceiverInterface() { } diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx index 534bd306027d..5bffefc7ed9d 100644 --- a/sfx2/source/sidebar/Deck.cxx +++ b/sfx2/source/sidebar/Deck.cxx @@ -76,7 +76,6 @@ Deck::Deck ( - Deck::~Deck (void) { Dispose(); @@ -88,8 +87,6 @@ Deck::~Deck (void) } - - void Deck::Dispose (void) { SharedPanelContainer aPanels; @@ -114,20 +111,12 @@ void Deck::Dispose (void) } - - - - - - DeckTitleBar* Deck::GetTitleBar (void) const { return mpTitleBar.get(); } - - Rectangle Deck::GetContentArea (void) const { const Size aWindowSize (GetSizePixel()); @@ -180,8 +169,6 @@ void Deck::Paint (const Rectangle& rUpdateArea) } - - void Deck::DataChanged (const DataChangedEvent& rEvent) { (void)rEvent; @@ -287,8 +274,6 @@ void Deck::ShowPanel (const Panel& rPanel) } - - const OUString GetWindowClassification (const vcl::Window* pWindow) { const OUString& rsName (pWindow->GetText()); @@ -339,8 +324,6 @@ IMPL_LINK(Deck, HandleVerticalScrollBarChange,void*, EMPTYARG) } - - //----- Deck::ScrollContainerWindow ------------------------------------------- Deck::ScrollContainerWindow::ScrollContainerWindow (vcl::Window* pParentWindow) @@ -353,15 +336,11 @@ Deck::ScrollContainerWindow::ScrollContainerWindow (vcl::Window* pParentWindow) } - - Deck::ScrollContainerWindow::~ScrollContainerWindow (void) { } - - void Deck::ScrollContainerWindow::Paint (const Rectangle& rUpdateArea) { (void)rUpdateArea; @@ -386,8 +365,6 @@ void Deck::ScrollContainerWindow::Paint (const Rectangle& rUpdateArea) } - - void Deck::ScrollContainerWindow::SetSeparators (const ::std::vector<sal_Int32>& rSeparators) { maSeparators = rSeparators; diff --git a/sfx2/source/sidebar/DeckDescriptor.cxx b/sfx2/source/sidebar/DeckDescriptor.cxx index bda152bd22bc..400c775a4fde 100644 --- a/sfx2/source/sidebar/DeckDescriptor.cxx +++ b/sfx2/source/sidebar/DeckDescriptor.cxx @@ -37,8 +37,6 @@ DeckDescriptor::DeckDescriptor (void) } - - DeckDescriptor::DeckDescriptor (const DeckDescriptor& rOther) : msTitle(rOther.msTitle), msId(rOther.msId), @@ -55,8 +53,6 @@ DeckDescriptor::DeckDescriptor (const DeckDescriptor& rOther) } - - DeckDescriptor::~DeckDescriptor (void) { } diff --git a/sfx2/source/sidebar/DeckLayouter.cxx b/sfx2/source/sidebar/DeckLayouter.cxx index 9d831a7628df..01dc10389bae 100644 --- a/sfx2/source/sidebar/DeckLayouter.cxx +++ b/sfx2/source/sidebar/DeckLayouter.cxx @@ -103,7 +103,6 @@ namespace { ++iterator_name) - void DeckLayouter::LayoutDeck ( const Rectangle aContentArea, sal_Int32& rMinimalWidth, @@ -248,8 +247,6 @@ Rectangle LayoutPanels ( } - - sal_Int32 PlacePanels ( ::std::vector<LayoutItem>& rLayoutItems, const sal_Int32 nWidth, @@ -343,8 +340,6 @@ sal_Int32 PlacePanels ( } - - void GetRequestedSizes ( ::std::vector<LayoutItem>& rLayoutItems, sal_Int32& rAvailableHeight, @@ -398,8 +393,6 @@ void GetRequestedSizes ( } - - void DistributeHeights ( ::std::vector<LayoutItem>& rLayoutItems, const sal_Int32 nHeightToDistribute, @@ -483,8 +476,6 @@ void DistributeHeights ( } - - Rectangle PlaceDeckTitle ( vcl::Window& rDeckTitleBar, const Rectangle& rAvailableSpace) @@ -513,8 +504,6 @@ Rectangle PlaceDeckTitle ( } - - Rectangle PlaceVerticalScrollBar ( ScrollBar& rVerticalScrollBar, const Rectangle& rAvailableSpace, @@ -543,8 +532,6 @@ Rectangle PlaceVerticalScrollBar ( } - - void SetupVerticalScrollBar( ScrollBar& rVerticalScrollBar, const sal_Int32 nContentHeight, @@ -558,8 +545,6 @@ void SetupVerticalScrollBar( } - - void UpdateFiller ( vcl::Window& rFiller, const Rectangle& rBox) diff --git a/sfx2/source/sidebar/DeckTitleBar.cxx b/sfx2/source/sidebar/DeckTitleBar.cxx index 9a476f804b4f..c57ba63987b4 100644 --- a/sfx2/source/sidebar/DeckTitleBar.cxx +++ b/sfx2/source/sidebar/DeckTitleBar.cxx @@ -55,15 +55,11 @@ DeckTitleBar::DeckTitleBar ( } - - DeckTitleBar::~DeckTitleBar (void) { } - - void DeckTitleBar::SetCloserVisible (const bool bIsCloserVisible) { if (mbIsCloserVisible != bIsCloserVisible) @@ -86,8 +82,6 @@ void DeckTitleBar::SetCloserVisible (const bool bIsCloserVisible) } - - Rectangle DeckTitleBar::GetTitleArea (const Rectangle& rTitleBarBox) { Image aGripImage (Theme::GetImage(Theme::Image_Grip)); @@ -99,32 +93,24 @@ Rectangle DeckTitleBar::GetTitleArea (const Rectangle& rTitleBarBox) } - - void DeckTitleBar::PaintDecoration (const Rectangle& rTitleBarBox) { (void)rTitleBarBox; } - - sidebar::Paint DeckTitleBar::GetBackgroundPaint (void) { return Theme::GetPaint(Theme::Paint_DeckTitleBarBackground); } - - Color DeckTitleBar::GetTextColor (void) { return Theme::GetColor(Theme::Color_DeckTitleFont); } - - void DeckTitleBar::HandleToolBoxItemClick (const sal_uInt16 nItemIndex) { if (nItemIndex == mnCloserItemIndex) @@ -134,7 +120,6 @@ void DeckTitleBar::HandleToolBoxItemClick (const sal_uInt16 nItemIndex) - css::uno::Reference<css::accessibility::XAccessible> DeckTitleBar::CreateAccessible (void) { const ::rtl::OUString sAccessibleName(msTitle); @@ -144,8 +129,6 @@ css::uno::Reference<css::accessibility::XAccessible> DeckTitleBar::CreateAccessi } - - void DeckTitleBar::DataChanged (const DataChangedEvent& rEvent) { maToolBox.SetItemImage( diff --git a/sfx2/source/sidebar/EnumContext.cxx b/sfx2/source/sidebar/EnumContext.cxx index 7f674c3036e1..32059da40691 100644 --- a/sfx2/source/sidebar/EnumContext.cxx +++ b/sfx2/source/sidebar/EnumContext.cxx @@ -49,8 +49,6 @@ EnumContext::EnumContext (void) } - - EnumContext::EnumContext ( const Application eApplication, const Context eContext) @@ -60,8 +58,6 @@ EnumContext::EnumContext ( } - - EnumContext::EnumContext ( const ::rtl::OUString& rsApplicationName, const ::rtl::OUString& rsContextName) @@ -71,16 +67,12 @@ EnumContext::EnumContext ( } - - sal_Int32 EnumContext::GetCombinedContext_DI (void) const { return CombinedEnumContext(GetApplication_DI(), meContext); } - - EnumContext::Application EnumContext::GetApplication_DI (void) const { switch (meApplication) @@ -109,8 +101,6 @@ bool EnumContext::operator== (const EnumContext aOther) } - - bool EnumContext::operator!= (const EnumContext aOther) { return meApplication!=aOther.meApplication @@ -119,7 +109,6 @@ bool EnumContext::operator!= (const EnumContext aOther) - void EnumContext::AddEntry (const ::rtl::OUString& rsName, const Application eApplication) { maApplicationMap[rsName] = eApplication; @@ -130,8 +119,6 @@ void EnumContext::AddEntry (const ::rtl::OUString& rsName, const Application eAp } - - void EnumContext::ProvideApplicationContainers (void) { if (maApplicationMap.empty()) @@ -153,8 +140,6 @@ void EnumContext::ProvideApplicationContainers (void) } - - EnumContext::Application EnumContext::GetApplicationEnum (const ::rtl::OUString& rsApplicationName) { ProvideApplicationContainers(); @@ -168,8 +153,6 @@ EnumContext::Application EnumContext::GetApplicationEnum (const ::rtl::OUString& } - - const ::rtl::OUString& EnumContext::GetApplicationName (const Application eApplication) { ProvideApplicationContainers(); @@ -182,8 +165,6 @@ const ::rtl::OUString& EnumContext::GetApplicationName (const Application eAppli } - - void EnumContext::AddEntry (const ::rtl::OUString& rsName, const Context eApplication) { maContextMap[rsName] = eApplication; @@ -194,8 +175,6 @@ void EnumContext::AddEntry (const ::rtl::OUString& rsName, const Context eApplic } - - void EnumContext::ProvideContextContainers (void) { if (maContextMap.empty()) @@ -235,8 +214,6 @@ void EnumContext::ProvideContextContainers (void) } - - EnumContext::Context EnumContext::GetContextEnum (const ::rtl::OUString& rsContextName) { ProvideContextContainers(); @@ -250,8 +227,6 @@ EnumContext::Context EnumContext::GetContextEnum (const ::rtl::OUString& rsConte } - - const ::rtl::OUString& EnumContext::GetContextName (const Context eContext) { ProvideContextContainers(); diff --git a/sfx2/source/sidebar/FocusManager.cxx b/sfx2/source/sidebar/FocusManager.cxx index f7bf4f0492c2..6b1406184a8d 100644 --- a/sfx2/source/sidebar/FocusManager.cxx +++ b/sfx2/source/sidebar/FocusManager.cxx @@ -37,8 +37,6 @@ FocusManager::FocusLocation::FocusLocation (const PanelComponent eComponent, con } - - FocusManager::FocusManager (const ::boost::function<void(const Panel&)>& rShowPanelFunctor) : mpDeckTitleBar(), maPanels(), @@ -51,24 +49,18 @@ FocusManager::FocusManager (const ::boost::function<void(const Panel&)>& rShowPa } - - FocusManager::~FocusManager (void) { Clear(); } - - void FocusManager::GrabFocus (void) { FocusDeckTitle(); } - - void FocusManager::Clear (void) { SetDeckTitle(NULL); @@ -77,8 +69,6 @@ void FocusManager::Clear (void) } - - void FocusManager::ClearPanels (void) { ::std::vector<Panel*> aPanels; @@ -99,8 +89,6 @@ void FocusManager::ClearPanels (void) } - - void FocusManager::ClearButtons (void) { ::std::vector<Button*> aButtons; @@ -114,8 +102,6 @@ void FocusManager::ClearButtons (void) } - - void FocusManager::SetDeckTitle (DeckTitleBar* pDeckTitleBar) { if (mpDeckTitleBar != NULL) @@ -133,8 +119,6 @@ void FocusManager::SetDeckTitle (DeckTitleBar* pDeckTitleBar) } - - void FocusManager::SetPanels (const SharedPanelContainer& rPanels) { ClearPanels(); @@ -157,8 +141,6 @@ void FocusManager::SetPanels (const SharedPanelContainer& rPanels) } - - void FocusManager::SetButtons (const ::std::vector<Button*>& rButtons) { ClearButtons(); @@ -172,24 +154,18 @@ void FocusManager::SetButtons (const ::std::vector<Button*>& rButtons) } - - void FocusManager::RegisterWindow (vcl::Window& rWindow) { rWindow.AddEventListener(LINK(this, FocusManager, WindowEventListener)); } - - void FocusManager::UnregisterWindow (vcl::Window& rWindow) { rWindow.RemoveEventListener(LINK(this, FocusManager, WindowEventListener)); } - - FocusManager::FocusLocation FocusManager::GetFocusLocation (const vcl::Window& rWindow) const { // Check the deck title. @@ -243,16 +219,12 @@ void FocusManager::FocusDeckTitle (void) } - - bool FocusManager::IsDeckTitleVisible (void) const { return mpDeckTitleBar != NULL && mpDeckTitleBar->IsVisible(); } - - bool FocusManager::IsPanelTitleVisible (const sal_Int32 nPanelIndex) const { if (nPanelIndex<0 || nPanelIndex>=static_cast<sal_Int32>(maPanels.size())) @@ -265,8 +237,6 @@ bool FocusManager::IsPanelTitleVisible (const sal_Int32 nPanelIndex) const } - - void FocusManager::FocusPanel ( const sal_Int32 nPanelIndex, const bool bFallbackToDeckTitle) @@ -305,8 +275,6 @@ void FocusManager::FocusPanel ( } - - void FocusManager::FocusPanelContent (const sal_Int32 nPanelIndex) { vcl::Window* pWindow = VCLUnoHelper::GetWindow(maPanels[nPanelIndex]->GetElementWindow()); @@ -319,8 +287,6 @@ void FocusManager::FocusPanelContent (const sal_Int32 nPanelIndex) } - - void FocusManager::FocusButton (const sal_Int32 nButtonIndex) { maButtons[nButtonIndex]->GrabFocus(); @@ -328,8 +294,6 @@ void FocusManager::FocusButton (const sal_Int32 nButtonIndex) } - - void FocusManager::ClickButton (const sal_Int32 nButtonIndex) { maButtons[nButtonIndex]->Click(); @@ -340,8 +304,6 @@ void FocusManager::ClickButton (const sal_Int32 nButtonIndex) } - - void FocusManager::RemoveWindow (vcl::Window& rWindow) { ::std::vector<Panel*>::iterator iPanel (::std::find(maPanels.begin(), maPanels.end(), &rWindow)); @@ -367,8 +329,6 @@ void FocusManager::RemoveWindow (vcl::Window& rWindow) } - - bool FocusManager::MoveFocusInsidePanel ( const FocusLocation& rFocusLocation, const sal_Int32 nDirection) @@ -397,8 +357,6 @@ bool FocusManager::MoveFocusInsidePanel ( } - - bool FocusManager::MoveFocusInsideDeckTitle ( const FocusLocation& rFocusLocation, const sal_Int32 nDirection) @@ -431,8 +389,6 @@ bool FocusManager::MoveFocusInsideDeckTitle ( } - - void FocusManager::HandleKeyEvent ( const vcl::KeyCode& rKeyCode, const vcl::Window& rWindow) @@ -583,8 +539,6 @@ void FocusManager::HandleKeyEvent ( } - - IMPL_LINK(FocusManager, WindowEventListener, VclSimpleEvent*, pEvent) { if (pEvent == NULL) @@ -624,8 +578,6 @@ IMPL_LINK(FocusManager, WindowEventListener, VclSimpleEvent*, pEvent) } - - IMPL_LINK(FocusManager, ChildEventListener, VclSimpleEvent*, pEvent) { if (pEvent == NULL) diff --git a/sfx2/source/sidebar/MenuButton.cxx b/sfx2/source/sidebar/MenuButton.cxx index 7bccc4f87b26..e9099fe661cb 100644 --- a/sfx2/source/sidebar/MenuButton.cxx +++ b/sfx2/source/sidebar/MenuButton.cxx @@ -43,14 +43,11 @@ MenuButton::MenuButton (vcl::Window* pParentWindow) - MenuButton::~MenuButton (void) { } - - void MenuButton::Paint (const Rectangle& rUpdateArea) { switch(mePaintType) @@ -89,8 +86,6 @@ void MenuButton::Paint (const Rectangle& rUpdateArea) } - - void MenuButton::MouseMove (const MouseEvent& rEvent) { if (rEvent.IsEnterWindow() || rEvent.IsLeaveWindow()) @@ -99,8 +94,6 @@ void MenuButton::MouseMove (const MouseEvent& rEvent) } - - void MenuButton::MouseButtonDown (const MouseEvent& rMouseEvent) { if (rMouseEvent.IsLeft()) @@ -112,8 +105,6 @@ void MenuButton::MouseButtonDown (const MouseEvent& rMouseEvent) } - - void MenuButton::MouseButtonUp (const MouseEvent& rMouseEvent) { if (IsMouseCaptured()) diff --git a/sfx2/source/sidebar/Paint.cxx b/sfx2/source/sidebar/Paint.cxx index ea99762a01ac..9daf7c0ad363 100644 --- a/sfx2/source/sidebar/Paint.cxx +++ b/sfx2/source/sidebar/Paint.cxx @@ -31,8 +31,6 @@ Paint::Paint (void) } - - Paint::Paint (const Color& rColor) : meType(ColorPaint), maValue(rColor) @@ -40,8 +38,6 @@ Paint::Paint (const Color& rColor) } - - Paint::Paint (const Gradient& rGradient) : meType(GradientPaint), maValue(rGradient) @@ -49,8 +45,6 @@ Paint::Paint (const Gradient& rGradient) } - - Paint Paint::Create (const css::uno::Any& rValue) { ColorData aColor (0); @@ -66,11 +60,6 @@ Paint Paint::Create (const css::uno::Any& rValue) - - - - - const Color& Paint::GetColor (void) const { if (meType != ColorPaint) @@ -84,8 +73,6 @@ const Color& Paint::GetColor (void) const } - - const Gradient& Paint::GetGradient (void) const { if (meType != GradientPaint) @@ -99,8 +86,6 @@ const Gradient& Paint::GetGradient (void) const } - - Wallpaper Paint::GetWallpaper (void) const { switch (meType) diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx index bc89d9b45a9f..769f8cc513ba 100644 --- a/sfx2/source/sidebar/Panel.cxx +++ b/sfx2/source/sidebar/Panel.cxx @@ -72,8 +72,6 @@ Panel::Panel ( } - - Panel::~Panel (void) { Dispose(); @@ -81,7 +79,6 @@ Panel::~Panel (void) - void Panel::Dispose (void) { mxPanelComponent = NULL; @@ -103,8 +100,6 @@ void Panel::Dispose (void) } - - PanelTitleBar* Panel::GetTitleBar (void) const { return mpTitleBar.get(); @@ -112,11 +107,6 @@ PanelTitleBar* Panel::GetTitleBar (void) const - - - - - void Panel::SetUIElement (const Reference<ui::XUIElement>& rxElement) { mxElement = rxElement; @@ -127,8 +117,6 @@ void Panel::SetUIElement (const Reference<ui::XUIElement>& rxElement) } - - void Panel::SetExpanded (const bool bIsExpanded) { if (mbIsExpanded != bIsExpanded) @@ -146,11 +134,6 @@ void Panel::SetExpanded (const bool bIsExpanded) - - - - - bool Panel::HasIdPredicate (const ::rtl::OUString& rsId) const { return msPanelId.equals(rsId); @@ -158,19 +141,12 @@ bool Panel::HasIdPredicate (const ::rtl::OUString& rsId) const - - - - - void Panel::Paint (const Rectangle& rUpdateArea) { Window::Paint(rUpdateArea); } - - void Panel::Resize (void) { Window::Resize(); @@ -190,17 +166,12 @@ void Panel::Resize (void) } - - void Panel::Activate (void) { Window::Activate(); } - - - void Panel::DataChanged (const DataChangedEvent& rEvent) { (void)rEvent; @@ -208,6 +179,7 @@ void Panel::DataChanged (const DataChangedEvent& rEvent) } + Reference<awt::XWindow> Panel::GetElementWindow (void) { if (mxElement.is()) diff --git a/sfx2/source/sidebar/PanelDescriptor.cxx b/sfx2/source/sidebar/PanelDescriptor.cxx index 8c3f70a8d191..b181ec731fd2 100644 --- a/sfx2/source/sidebar/PanelDescriptor.cxx +++ b/sfx2/source/sidebar/PanelDescriptor.cxx @@ -39,8 +39,6 @@ PanelDescriptor::PanelDescriptor (void) } - - PanelDescriptor::PanelDescriptor (const PanelDescriptor& rOther) : msTitle(rOther.msTitle), mbIsTitleBarOptional(rOther.mbIsTitleBarOptional), @@ -58,7 +56,6 @@ PanelDescriptor::PanelDescriptor (const PanelDescriptor& rOther) } - PanelDescriptor::~PanelDescriptor (void) { } diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx b/sfx2/source/sidebar/PanelTitleBar.cxx index 983b25de38ab..5888fa008134 100644 --- a/sfx2/source/sidebar/PanelTitleBar.cxx +++ b/sfx2/source/sidebar/PanelTitleBar.cxx @@ -62,14 +62,11 @@ PanelTitleBar::PanelTitleBar ( - PanelTitleBar::~PanelTitleBar (void) { } - - void PanelTitleBar::SetMoreOptionsCommand ( const ::rtl::OUString& rsCommandName, const css::uno::Reference<css::frame::XFrame>& rxFrame) @@ -105,8 +102,6 @@ void PanelTitleBar::SetMoreOptionsCommand ( } - - Rectangle PanelTitleBar::GetTitleArea (const Rectangle& rTitleBarBox) { if (mpPanel != NULL) @@ -125,8 +120,6 @@ Rectangle PanelTitleBar::GetTitleArea (const Rectangle& rTitleBarBox) } - - void PanelTitleBar::PaintDecoration (const Rectangle& rTitleBarBox) { (void)rTitleBarBox; @@ -144,24 +137,18 @@ void PanelTitleBar::PaintDecoration (const Rectangle& rTitleBarBox) } - - Paint PanelTitleBar::GetBackgroundPaint (void) { return Theme::GetPaint(Theme::Paint_PanelTitleBarBackground); } - - Color PanelTitleBar::GetTextColor (void) { return Theme::GetColor(Theme::Color_PanelTitleFont); } - - void PanelTitleBar::HandleToolBoxItemClick (const sal_uInt16 nItemIndex) { if (nItemIndex == mnMenuItemIndex) @@ -183,8 +170,6 @@ void PanelTitleBar::HandleToolBoxItemClick (const sal_uInt16 nItemIndex) } - - Reference<accessibility::XAccessible> PanelTitleBar::CreateAccessible (void) { const ::rtl::OUString sAccessibleName(msAccessibleNamePrefix + msTitle); @@ -194,8 +179,6 @@ Reference<accessibility::XAccessible> PanelTitleBar::CreateAccessible (void) } - - void PanelTitleBar::MouseButtonDown (const MouseEvent& rMouseEvent) { if (rMouseEvent.IsLeft()) @@ -206,8 +189,6 @@ void PanelTitleBar::MouseButtonDown (const MouseEvent& rMouseEvent) } - - void PanelTitleBar::MouseButtonUp (const MouseEvent& rMouseEvent) { if (IsMouseCaptured()) @@ -229,8 +210,6 @@ void PanelTitleBar::MouseButtonUp (const MouseEvent& rMouseEvent) } - - void PanelTitleBar::DataChanged (const DataChangedEvent& rEvent) { maToolBox.SetItemImage( diff --git a/sfx2/source/sidebar/PopupContainer.cxx b/sfx2/source/sidebar/PopupContainer.cxx index 92e5e20f37a3..621a8248fd01 100644 --- a/sfx2/source/sidebar/PopupContainer.cxx +++ b/sfx2/source/sidebar/PopupContainer.cxx @@ -28,15 +28,12 @@ PopupContainer::PopupContainer (vcl::Window* pParent) } - - PopupContainer::~PopupContainer (void) { } - long PopupContainer::Notify (NotifyEvent& rEvent) { if (rEvent.GetType() == MouseNotifyEvent::LOSEFOCUS) diff --git a/sfx2/source/sidebar/ResourceManager.cxx b/sfx2/source/sidebar/ResourceManager.cxx index 966c0ddb5163..d4add6536b3d 100644 --- a/sfx2/source/sidebar/ResourceManager.cxx +++ b/sfx2/source/sidebar/ResourceManager.cxx @@ -45,8 +45,6 @@ ResourceManager& ResourceManager::Instance (void) } - - ResourceManager::ResourceManager (void) : maDecks(), maPanels(), @@ -57,8 +55,6 @@ ResourceManager::ResourceManager (void) } - - ResourceManager::~ResourceManager (void) { maPanels.clear(); @@ -66,8 +62,6 @@ ResourceManager::~ResourceManager (void) } - - const DeckDescriptor* ResourceManager::GetDeckDescriptor ( const ::rtl::OUString& rsDeckId) const { @@ -84,8 +78,6 @@ const DeckDescriptor* ResourceManager::GetDeckDescriptor ( } - - const PanelDescriptor* ResourceManager::GetPanelDescriptor ( const ::rtl::OUString& rsPanelId) const { @@ -102,8 +94,6 @@ const PanelDescriptor* ResourceManager::GetPanelDescriptor ( } - - void ResourceManager::SetIsDeckEnabled ( const ::rtl::OUString& rsDeckId, const bool bIsEnabled) @@ -123,8 +113,6 @@ void ResourceManager::SetIsDeckEnabled ( } - - const ResourceManager::DeckContextDescriptorContainer& ResourceManager::GetMatchingDecks ( DeckContextDescriptorContainer& rDecks, const Context& rContext, @@ -166,8 +154,6 @@ const ResourceManager::DeckContextDescriptorContainer& ResourceManager::GetMatch } - - const ResourceManager::PanelContextDescriptorContainer& ResourceManager::GetMatchingPanels ( PanelContextDescriptorContainer& rPanelIds, const Context& rContext, @@ -214,8 +200,6 @@ const ResourceManager::PanelContextDescriptorContainer& ResourceManager::GetMatc } - - void ResourceManager::ReadDeckList (void) { const ::utl::OConfigurationTreeRoot aDeckRootNode ( @@ -269,8 +253,6 @@ void ResourceManager::ReadDeckList (void) } - - void ResourceManager::ReadPanelList (void) { const ::utl::OConfigurationTreeRoot aPanelRootNode ( @@ -330,8 +312,6 @@ void ResourceManager::ReadPanelList (void) } - - void ResourceManager::ReadContextList ( const ::utl::OConfigurationNode& rParentNode, ContextList& rContextList, @@ -477,8 +457,6 @@ void ResourceManager::ReadContextList ( } - - void ResourceManager::ReadLegacyAddons (const Reference<frame::XFrame>& rxFrame) { // Get module name for given frame. @@ -561,8 +539,6 @@ void ResourceManager::ReadLegacyAddons (const Reference<frame::XFrame>& rxFrame) } - - void ResourceManager::StorePanelExpansionState ( const ::rtl::OUString& rsPanelId, const bool bExpansionState, @@ -586,7 +562,6 @@ void ResourceManager::StorePanelExpansionState ( - ::utl::OConfigurationTreeRoot ResourceManager::GetLegacyAddonRootNode ( const ::rtl::OUString& rsModuleName) const { @@ -617,8 +592,6 @@ void ResourceManager::StorePanelExpansionState ( } - - void ResourceManager::GetToolPanelNodeNames ( ::std::vector<OUString>& rMatchingNames, const ::utl::OConfigurationTreeRoot& aRoot) const @@ -633,8 +606,6 @@ void ResourceManager::GetToolPanelNodeNames ( } - - bool ResourceManager::IsDeckEnabled ( const OUString& rsDeckId, const Context& rContext, diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx b/sfx2/source/sidebar/SidebarDockingWindow.cxx index 24206b160e85..5f5fca14c8bb 100644 --- a/sfx2/source/sidebar/SidebarDockingWindow.cxx +++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx @@ -54,16 +54,12 @@ SidebarDockingWindow::SidebarDockingWindow( } - - SidebarDockingWindow::~SidebarDockingWindow (void) { DoDispose(); } - - void SidebarDockingWindow::DoDispose (void) { Reference<lang::XComponent> xComponent (static_cast<XWeak*>(mpSidebarController.get()), UNO_QUERY); @@ -75,8 +71,6 @@ void SidebarDockingWindow::DoDispose (void) } - - void SidebarDockingWindow::GetFocus() { if (mpSidebarController.is()) @@ -86,8 +80,6 @@ void SidebarDockingWindow::GetFocus() } - - // fdo#87217 bool SidebarDockingWindow::Close (void) { @@ -95,8 +87,6 @@ bool SidebarDockingWindow::Close (void) } - - SfxChildAlignment SidebarDockingWindow::CheckAlignment ( SfxChildAlignment eCurrentAlignment, SfxChildAlignment eRequestedAlignment) diff --git a/sfx2/source/sidebar/SidebarPanelBase.cxx b/sfx2/source/sidebar/SidebarPanelBase.cxx index 74f3c0e9d859..537f166618e9 100644 --- a/sfx2/source/sidebar/SidebarPanelBase.cxx +++ b/sfx2/source/sidebar/SidebarPanelBase.cxx @@ -50,8 +50,6 @@ Reference<ui::XUIElement> SidebarPanelBase::Create ( } - - SidebarPanelBase::SidebarPanelBase ( const ::rtl::OUString& rsResourceURL, const css::uno::Reference<css::frame::XFrame>& rxFrame, @@ -79,15 +77,11 @@ SidebarPanelBase::SidebarPanelBase ( } - - SidebarPanelBase::~SidebarPanelBase (void) { } - - void SAL_CALL SidebarPanelBase::disposing (void) throw (css::uno::RuntimeException) { @@ -109,8 +103,6 @@ void SAL_CALL SidebarPanelBase::disposing (void) } - - // XContextChangeEventListener void SAL_CALL SidebarPanelBase::notifyContextChangeEvent ( const ui::ContextChangeEventObject& rEvent) @@ -128,8 +120,6 @@ void SAL_CALL SidebarPanelBase::notifyContextChangeEvent ( } - - void SAL_CALL SidebarPanelBase::disposing ( const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException, std::exception) @@ -141,8 +131,6 @@ void SAL_CALL SidebarPanelBase::disposing ( } - - css::uno::Reference<css::frame::XFrame> SAL_CALL SidebarPanelBase::getFrame (void) throw(css::uno::RuntimeException, std::exception) { @@ -150,8 +138,6 @@ css::uno::Reference<css::frame::XFrame> SAL_CALL SidebarPanelBase::getFrame (voi } - - ::rtl::OUString SAL_CALL SidebarPanelBase::getResourceURL (void) throw(css::uno::RuntimeException, std::exception) { @@ -159,8 +145,6 @@ css::uno::Reference<css::frame::XFrame> SAL_CALL SidebarPanelBase::getFrame (voi } - - sal_Int16 SAL_CALL SidebarPanelBase::getType (void) throw(css::uno::RuntimeException, std::exception) { @@ -168,8 +152,6 @@ sal_Int16 SAL_CALL SidebarPanelBase::getType (void) } - - Reference<XInterface> SAL_CALL SidebarPanelBase::getRealInterface (void) throw(css::uno::RuntimeException, std::exception) { @@ -177,8 +159,6 @@ Reference<XInterface> SAL_CALL SidebarPanelBase::getRealInterface (void) } - - Reference<accessibility::XAccessible> SAL_CALL SidebarPanelBase::createAccessible ( const Reference<accessibility::XAccessible>& rxParentAccessible) throw(css::uno::RuntimeException, std::exception) @@ -190,8 +170,6 @@ Reference<accessibility::XAccessible> SAL_CALL SidebarPanelBase::createAccessibl } - - Reference<awt::XWindow> SAL_CALL SidebarPanelBase::getWindow (void) throw(css::uno::RuntimeException, std::exception) { @@ -204,8 +182,6 @@ Reference<awt::XWindow> SAL_CALL SidebarPanelBase::getWindow (void) } - - ui::LayoutSize SAL_CALL SidebarPanelBase::getHeightForWidth (const sal_Int32 nWidth) throw(css::uno::RuntimeException, std::exception) { diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx index 506af77bc3b2..45919411992b 100644 --- a/sfx2/source/sidebar/SidebarToolBox.cxx +++ b/sfx2/source/sidebar/SidebarToolBox.cxx @@ -116,8 +116,6 @@ void SidebarToolBox::Paint (const Rectangle& rRect) } - - bool SidebarToolBox::Notify (NotifyEvent& rEvent) { if (rEvent.GetType() == MouseNotifyEvent::KEYINPUT) @@ -134,8 +132,6 @@ bool SidebarToolBox::Notify (NotifyEvent& rEvent) } - - void SidebarToolBox::CreateController ( const sal_uInt16 nItemId, const css::uno::Reference<css::frame::XFrame>& rxFrame, @@ -162,8 +158,6 @@ void SidebarToolBox::CreateController ( } - - Reference<frame::XToolbarController> SidebarToolBox::GetControllerForItemId (const sal_uInt16 nItemId) const { ControllerContainer::const_iterator iController (maControllers.find(nItemId)); @@ -174,8 +168,6 @@ Reference<frame::XToolbarController> SidebarToolBox::GetControllerForItemId (con } - - void SidebarToolBox::SetController( const sal_uInt16 nItemId, const css::uno::Reference<css::frame::XToolbarController>& rxController, @@ -205,8 +197,6 @@ void SidebarToolBox::SetController( } - - sal_uInt16 SidebarToolBox::GetItemIdForSubToolbarName (const OUString& rsSubToolbarName) const { for (ControllerContainer::const_iterator iController(maControllers.begin()), iEnd(maControllers.end()); @@ -226,8 +216,6 @@ sal_uInt16 SidebarToolBox::GetItemIdForSubToolbarName (const OUString& rsSubTool } - - void SidebarToolBox::RegisterHandlers (void) { if ( ! mbAreHandlersRegistered) @@ -243,8 +231,6 @@ void SidebarToolBox::RegisterHandlers (void) } - - IMPL_LINK(SidebarToolBox, DropDownClickHandler, ToolBox*, pToolBox) { if (pToolBox != NULL) @@ -261,8 +247,6 @@ IMPL_LINK(SidebarToolBox, DropDownClickHandler, ToolBox*, pToolBox) } - - IMPL_LINK(SidebarToolBox, ClickHandler, ToolBox*, pToolBox) { if (pToolBox == NULL) @@ -276,8 +260,6 @@ IMPL_LINK(SidebarToolBox, ClickHandler, ToolBox*, pToolBox) } - - IMPL_LINK(SidebarToolBox, DoubleClickHandler, ToolBox*, pToolBox) { if (pToolBox == NULL) @@ -291,8 +273,6 @@ IMPL_LINK(SidebarToolBox, DoubleClickHandler, ToolBox*, pToolBox) } - - IMPL_LINK(SidebarToolBox, SelectHandler, ToolBox*, pToolBox) { if (pToolBox == NULL) @@ -306,16 +286,12 @@ IMPL_LINK(SidebarToolBox, SelectHandler, ToolBox*, pToolBox) } - - IMPL_LINK(SidebarToolBox, ActivateToolBox, ToolBox*, EMPTYARG) { return 1; } - - IMPL_LINK(SidebarToolBox, DeactivateToolBox, ToolBox*, EMPTYARG) { return 1; diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx index 563b5feb12c8..829f5f016cfb 100644 --- a/sfx2/source/sidebar/TabBar.cxx +++ b/sfx2/source/sidebar/TabBar.cxx @@ -67,15 +67,11 @@ TabBar::TabBar ( } - - TabBar::~TabBar (void) { } - - void TabBar::Paint (const Rectangle& rUpdateArea) { Window::Paint(rUpdateArea); @@ -88,8 +84,6 @@ void TabBar::Paint (const Rectangle& rUpdateArea) } - - sal_Int32 TabBar::GetDefaultWidth (void) { return Theme::GetInteger(Theme::Int_TabItemWidth) @@ -98,8 +92,6 @@ sal_Int32 TabBar::GetDefaultWidth (void) } - - void TabBar::SetDecks ( const ResourceManager::DeckContextDescriptorContainer& rDecks) { @@ -114,7 +106,6 @@ void TabBar::SetDecks ( } maItems.clear(); } - maItems.resize(rDecks.size()); sal_Int32 nIndex (0); for (ResourceManager::DeckContextDescriptorContainer::const_iterator @@ -146,8 +137,6 @@ void TabBar::SetDecks ( } - - void TabBar::UpdateButtonIcons (void) { Image aImage = Theme::GetImage(Theme::Image_TabBarMenu); @@ -183,8 +172,6 @@ void TabBar::UpdateButtonIcons (void) } - - void TabBar::Layout (void) { const SvBorder aPadding ( @@ -233,8 +220,6 @@ void TabBar::Layout (void) } - - void TabBar::HighlightDeck (const ::rtl::OUString& rsDeckId) { for (ItemContainer::iterator iItem(maItems.begin()),iEnd(maItems.end()); @@ -249,8 +234,6 @@ void TabBar::HighlightDeck (const ::rtl::OUString& rsDeckId) } - - void TabBar::RemoveDeckHighlight () { for (ItemContainer::iterator iItem(maItems.begin()),iEnd(maItems.end()); @@ -262,8 +245,6 @@ void TabBar::RemoveDeckHighlight () } - - void TabBar::DataChanged (const DataChangedEvent& rDataChangedEvent) { SetBackground(Theme::GetPaint(Theme::Paint_TabBarBackground).GetWallpaper()); @@ -273,8 +254,6 @@ void TabBar::DataChanged (const DataChangedEvent& rDataChangedEvent) } - - bool TabBar::Notify (NotifyEvent&) { return false; @@ -282,7 +261,6 @@ bool TabBar::Notify (NotifyEvent&) - RadioButton* TabBar::CreateTabItem (const DeckDescriptor& rDeckDescriptor) { RadioButton* pItem = ControlFactory::CreateTabItem(this); @@ -293,7 +271,6 @@ RadioButton* TabBar::CreateTabItem (const DeckDescriptor& rDeckDescriptor) } - Image TabBar::GetItemImage (const DeckDescriptor& rDeckDescriptor) const { return Tools::GetImage( @@ -304,8 +281,6 @@ Image TabBar::GetItemImage (const DeckDescriptor& rDeckDescriptor) const - - IMPL_LINK(TabBar::Item, HandleClick, Button*, EMPTYARG) { try @@ -318,8 +293,6 @@ IMPL_LINK(TabBar::Item, HandleClick, Button*, EMPTYARG) } - - const ::rtl::OUString TabBar::GetDeckIdForIndex (const sal_Int32 nIndex) const { if (nIndex<0 || static_cast<size_t>(nIndex)>=maItems.size()) @@ -329,8 +302,6 @@ const ::rtl::OUString TabBar::GetDeckIdForIndex (const sal_Int32 nIndex) const } - - void TabBar::ToggleHideFlag (const sal_Int32 nIndex) { if (nIndex<0 || static_cast<size_t>(nIndex)>=maItems.size()) @@ -346,8 +317,6 @@ void TabBar::ToggleHideFlag (const sal_Int32 nIndex) } - - void TabBar::RestoreHideFlags (void) { bool bNeedsLayout (false); @@ -366,8 +335,6 @@ void TabBar::RestoreHideFlags (void) } - - void TabBar::UpdateFocusManager (FocusManager& rFocusManager) { ::std::vector<Button*> aButtons; @@ -385,8 +352,6 @@ void TabBar::UpdateFocusManager (FocusManager& rFocusManager) } - - IMPL_LINK(TabBar, OnToolboxClicked, void*, EMPTYARG) { if ( ! mpMenuButton) @@ -423,7 +388,6 @@ IMPL_LINK(TabBar, OnToolboxClicked, void*, EMPTYARG) } - } } // end of namespace sfx2::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/sidebar/TabItem.cxx b/sfx2/source/sidebar/TabItem.cxx index a7037da0f73a..335c8b498104 100644 --- a/sfx2/source/sidebar/TabItem.cxx +++ b/sfx2/source/sidebar/TabItem.cxx @@ -45,15 +45,11 @@ TabItem::TabItem (vcl::Window* pParentWindow) } - - TabItem::~TabItem (void) { } - - void TabItem::Paint (const Rectangle& rUpdateArea) { switch(mePaintType) @@ -93,7 +89,6 @@ void TabItem::Paint (const Rectangle& rUpdateArea) - void TabItem::MouseMove (const MouseEvent& rEvent) { if (rEvent.IsEnterWindow() || rEvent.IsLeaveWindow()) @@ -102,8 +97,6 @@ void TabItem::MouseMove (const MouseEvent& rEvent) } - - void TabItem::MouseButtonDown (const MouseEvent& rMouseEvent) { if (rMouseEvent.IsLeft()) @@ -115,8 +108,6 @@ void TabItem::MouseButtonDown (const MouseEvent& rMouseEvent) } - - void TabItem::MouseButtonUp (const MouseEvent& rMouseEvent) { if (IsMouseCaptured()) @@ -139,7 +130,6 @@ void TabItem::MouseButtonUp (const MouseEvent& rMouseEvent) } - } } // end of namespace sfx2::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx index adae89ec4b03..19268bd7d18c 100644 --- a/sfx2/source/sidebar/Theme.cxx +++ b/sfx2/source/sidebar/Theme.cxx @@ -59,15 +59,11 @@ Theme::Theme() } - - Theme::~Theme (void) { } - - Image Theme::GetImage (const ThemeItem eItem) { const PropertyType eType (GetPropertyType(eItem)); @@ -78,8 +74,6 @@ Image Theme::GetImage (const ThemeItem eItem) } - - Color Theme::GetColor (const ThemeItem eItem) { const PropertyType eType (GetPropertyType(eItem)); @@ -95,8 +89,6 @@ Color Theme::GetColor (const ThemeItem eItem) } - - const Paint& Theme::GetPaint (const ThemeItem eItem) { const PropertyType eType (GetPropertyType(eItem)); @@ -107,16 +99,12 @@ const Paint& Theme::GetPaint (const ThemeItem eItem) } - - const Wallpaper Theme::GetWallpaper (const ThemeItem eItem) { return GetPaint(eItem).GetWallpaper(); } - - sal_Int32 Theme::GetInteger (const ThemeItem eItem) { const PropertyType eType (GetPropertyType(eItem)); @@ -127,8 +115,6 @@ sal_Int32 Theme::GetInteger (const ThemeItem eItem) } - - bool Theme::GetBoolean (const ThemeItem eItem) { const PropertyType eType (GetPropertyType(eItem)); @@ -139,8 +125,6 @@ bool Theme::GetBoolean (const ThemeItem eItem) } - - bool Theme::IsHighContrastMode (void) { const Theme& rTheme (GetCurrentTheme()); @@ -148,8 +132,6 @@ bool Theme::IsHighContrastMode (void) } - - void Theme::HandleDataChange (void) { Theme& rTheme (GetCurrentTheme()); @@ -165,8 +147,6 @@ void Theme::HandleDataChange (void) } - - void Theme::InitializeTheme (void) { setPropertyValue( @@ -178,8 +158,6 @@ void Theme::InitializeTheme (void) } - - void Theme::UpdateTheme (void) { SidebarResource aLocalResource; @@ -424,8 +402,6 @@ void Theme::UpdateTheme (void) } - - void SAL_CALL Theme::disposing (void) { ChangeListeners aListeners; @@ -457,16 +433,12 @@ void SAL_CALL Theme::disposing (void) } - - Reference<beans::XPropertySet> Theme::GetPropertySet (void) { return Reference<beans::XPropertySet>(static_cast<XWeak*>(&GetCurrentTheme()), UNO_QUERY); } - - Reference<beans::XPropertySetInfo> SAL_CALL Theme::getPropertySetInfo (void) throw(css::uno::RuntimeException, std::exception) { @@ -539,8 +511,6 @@ Any SAL_CALL Theme::getPropertyValue ( } - - void SAL_CALL Theme::addPropertyChangeListener( const ::rtl::OUString& rsPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener) @@ -567,8 +537,6 @@ void SAL_CALL Theme::addPropertyChangeListener( } - - void SAL_CALL Theme::removePropertyChangeListener( const ::rtl::OUString& rsPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener) @@ -605,8 +573,6 @@ void SAL_CALL Theme::removePropertyChangeListener( } - - void SAL_CALL Theme::addVetoableChangeListener( const ::rtl::OUString& rsPropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener) @@ -633,8 +599,6 @@ void SAL_CALL Theme::addVetoableChangeListener( } - - void SAL_CALL Theme::removeVetoableChangeListener( const ::rtl::OUString& rsPropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener) @@ -670,8 +634,6 @@ void SAL_CALL Theme::removeVetoableChangeListener( } - - css::uno::Sequence<css::beans::Property> SAL_CALL Theme::getProperties (void) throw(css::uno::RuntimeException, std::exception) { @@ -698,8 +660,6 @@ css::uno::Sequence<css::beans::Property> SAL_CALL Theme::getProperties (void) } - - beans::Property SAL_CALL Theme::getPropertyByName (const ::rtl::OUString& rsPropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) @@ -722,8 +682,6 @@ beans::Property SAL_CALL Theme::getPropertyByName (const ::rtl::OUString& rsProp } - - sal_Bool SAL_CALL Theme::hasPropertyByName (const ::rtl::OUString& rsPropertyName) throw(css::uno::RuntimeException, std::exception) { @@ -739,8 +697,6 @@ sal_Bool SAL_CALL Theme::hasPropertyByName (const ::rtl::OUString& rsPropertyNam } - - void Theme::SetupPropertyMaps (void) { maPropertyIdToNameMap.resize(__Post_Rect); @@ -893,8 +849,6 @@ Theme::PropertyType Theme::GetPropertyType (const ThemeItem eItem) } - - css::uno::Type Theme::GetCppuType (const PropertyType eType) { switch(eType) @@ -924,8 +878,6 @@ css::uno::Type Theme::GetCppuType (const PropertyType eType) } - - sal_Int32 Theme::GetIndex (const ThemeItem eItem, const PropertyType eType) { switch(eType) @@ -950,8 +902,6 @@ sal_Int32 Theme::GetIndex (const ThemeItem eItem, const PropertyType eType) } - - Theme::VetoableListenerContainer* Theme::GetVetoableListeners ( const ThemeItem eItem, const bool bCreate) @@ -969,8 +919,6 @@ Theme::VetoableListenerContainer* Theme::GetVetoableListeners ( } - - Theme::ChangeListenerContainer* Theme::GetChangeListeners ( const ThemeItem eItem, const bool bCreate) @@ -988,8 +936,6 @@ Theme::ChangeListenerContainer* Theme::GetChangeListeners ( } - - bool Theme::DoVetoableListenersVeto ( const VetoableListenerContainer* pListeners, const beans::PropertyChangeEvent& rEvent) const @@ -1021,8 +967,6 @@ bool Theme::DoVetoableListenersVeto ( } - - void Theme::BroadcastPropertyChange ( const ChangeListenerContainer* pListeners, const beans::PropertyChangeEvent& rEvent) const @@ -1049,8 +993,6 @@ void Theme::BroadcastPropertyChange ( } - - void Theme::ProcessNewValue ( const Any& rValue, const ThemeItem eItem, diff --git a/sfx2/source/sidebar/TitleBar.cxx b/sfx2/source/sidebar/TitleBar.cxx index fb1597cade79..b02bc3f6e783 100644 --- a/sfx2/source/sidebar/TitleBar.cxx +++ b/sfx2/source/sidebar/TitleBar.cxx @@ -52,15 +52,11 @@ TitleBar::TitleBar ( } - - TitleBar::~TitleBar (void) { } - - void TitleBar::SetTitle (const ::rtl::OUString& rsTitle) { msTitle = rsTitle; @@ -68,8 +64,6 @@ void TitleBar::SetTitle (const ::rtl::OUString& rsTitle) } - - void TitleBar::SetIcon (const Image& rIcon) { maIcon = rIcon; @@ -77,8 +71,6 @@ void TitleBar::SetIcon (const Image& rIcon) } - - void TitleBar::Paint (const Rectangle& rUpdateArea) { (void)rUpdateArea; @@ -99,8 +91,6 @@ void TitleBar::Paint (const Rectangle& rUpdateArea) } - - void TitleBar::DataChanged (const DataChangedEvent& rEvent) { (void)rEvent; @@ -109,8 +99,6 @@ void TitleBar::DataChanged (const DataChangedEvent& rEvent) } - - void TitleBar::setPosSizePixel ( long nX, long nY, @@ -127,16 +115,6 @@ void TitleBar::setPosSizePixel ( } - - - - - - - - - - void TitleBar::HandleToolBoxItemClick (const sal_uInt16 nItemIndex) { (void)nItemIndex; @@ -144,8 +122,6 @@ void TitleBar::HandleToolBoxItemClick (const sal_uInt16 nItemIndex) } - - css::uno::Reference<css::accessibility::XAccessible> TitleBar::CreateAccessible (void) { SetAccessibleRole(css::accessibility::AccessibleRole::PANEL); @@ -153,8 +129,6 @@ css::uno::Reference<css::accessibility::XAccessible> TitleBar::CreateAccessible } - - void TitleBar::PaintTitle (const Rectangle& rTitleBox) { Push(PushFlags::FONT | PushFlags::TEXTCOLOR); @@ -188,8 +162,6 @@ void TitleBar::PaintTitle (const Rectangle& rTitleBox) } - - void TitleBar::PaintFocus (const Rectangle& rFocusBox) { Push(PushFlags::FONT | PushFlags::TEXTCOLOR); @@ -218,8 +190,6 @@ void TitleBar::PaintFocus (const Rectangle& rFocusBox) } - - IMPL_LINK(TitleBar, SelectionHandler, ToolBox*, pToolBox) { (void)pToolBox; diff --git a/sfx2/source/sidebar/Tools.cxx b/sfx2/source/sidebar/Tools.cxx index 09bf49febb56..8789546eae17 100644 --- a/sfx2/source/sidebar/Tools.cxx +++ b/sfx2/source/sidebar/Tools.cxx @@ -51,8 +51,6 @@ Image Tools::GetImage ( } - - Image Tools::GetImage ( const ::rtl::OUString& rsURL, const Reference<frame::XFrame>& rxFrame) @@ -96,8 +94,6 @@ Image Tools::GetImage ( } - - css::awt::Gradient Tools::VclToAwtGradient (const Gradient aVclGradient) { css::awt::Gradient aAwtGradient ( @@ -115,8 +111,6 @@ css::awt::Gradient Tools::VclToAwtGradient (const Gradient aVclGradient) } - - Gradient Tools::AwtToVclGradient (const css::awt::Gradient aAwtGradient) { Gradient aVclGradient ( @@ -135,8 +129,6 @@ Gradient Tools::AwtToVclGradient (const css::awt::Gradient aAwtGradient) } - - util::URL Tools::GetURL (const ::rtl::OUString& rsCommand) { util::URL aURL; @@ -150,8 +142,6 @@ util::URL Tools::GetURL (const ::rtl::OUString& rsCommand) } - - Reference<frame::XDispatch> Tools::GetDispatch ( const css::uno::Reference<css::frame::XFrame>& rxFrame, const util::URL& rURL) @@ -162,8 +152,6 @@ Reference<frame::XDispatch> Tools::GetDispatch ( } - - ::rtl::OUString Tools::GetModuleName ( const css::uno::Reference<css::frame::XFrame>& rxFrame) { |