diff options
| author | gamebusterz <gamebusterz2@gmail.com> | 2015-02-21 00:46:20 +0530 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-02-20 21:25:49 +0000 |
| commit | 1d85cf3504f5dcbbf0ae017eee47fc5a302a2739 (patch) | |
| tree | 65d578a83fb0e00b4485247344072912f87ef81f | |
| parent | 5bd8dcd45cb37b093e526c929ff9e3f382b8a758 (diff) | |
tdf Removed redundant blank lines in sfx2/source/sidebar (Now one line gap)
Change-Id: I603967833df03c1073b7bcac86da59b28a2835f0
Reviewed-on: https://gerrit.libreoffice.org/14569
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
58 files changed, 0 insertions, 408 deletions
diff --git a/sfx2/source/sidebar/Accessible.cxx b/sfx2/source/sidebar/Accessible.cxx index 5a309cac4991..00c669eee6c4 100644 --- a/sfx2/source/sidebar/Accessible.cxx +++ b/sfx2/source/sidebar/Accessible.cxx @@ -19,14 +19,11 @@ #include "Accessible.hxx" - using namespace css; using namespace css::uno; - namespace sfx2 { namespace sidebar { - Accessible::Accessible ( const Reference<accessibility::XAccessibleContext>& rxContext) : AccessibleInterfaceBase(m_aMutex), @@ -34,12 +31,10 @@ Accessible::Accessible ( { } - Accessible::~Accessible (void) { } - void SAL_CALL Accessible::disposing (void) { Reference<XComponent> xComponent (mxContext, UNO_QUERY); @@ -47,14 +42,12 @@ void SAL_CALL Accessible::disposing (void) xComponent->dispose(); } - Reference<accessibility::XAccessibleContext> SAL_CALL Accessible::getAccessibleContext (void) throw (css::uno::RuntimeException, std::exception) { return mxContext; } - } } // end of namespace sfx2::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/sidebar/Accessible.hxx b/sfx2/source/sidebar/Accessible.hxx index dfd450627a6a..8e9ddcdf34f0 100644 --- a/sfx2/source/sidebar/Accessible.hxx +++ b/sfx2/source/sidebar/Accessible.hxx @@ -27,7 +27,6 @@ #include <cppuhelper/compbase1.hxx> #include <cppuhelper/basemutex.hxx> - namespace { typedef ::cppu::WeakComponentImplHelper1 < @@ -53,8 +52,6 @@ public: virtual ~Accessible (void); virtual void SAL_CALL disposing (void) SAL_OVERRIDE; - - // XAccessible virtual css::uno::Reference<css::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext (void) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -63,7 +60,6 @@ private: css::uno::Reference<css::accessibility::XAccessibleContext> mxContext; }; - } } // end of namespace sfx2::sidebar #endif diff --git a/sfx2/source/sidebar/AccessibleTitleBar.cxx b/sfx2/source/sidebar/AccessibleTitleBar.cxx index 110c6af5afde..a3713ec801e6 100644 --- a/sfx2/source/sidebar/AccessibleTitleBar.cxx +++ b/sfx2/source/sidebar/AccessibleTitleBar.cxx @@ -40,25 +40,21 @@ Reference<accessibility::XAccessible> AccessibleTitleBar::Create (TitleBar& rTit return NULL; } - AccessibleTitleBar::AccessibleTitleBar (VCLXWindow* pWindow) : VCLXAccessibleComponent(pWindow) { } - AccessibleTitleBar::~AccessibleTitleBar (void) { } - void AccessibleTitleBar::FillAccessibleStateSet (utl::AccessibleStateSetHelper& rStateSet) { VCLXAccessibleComponent::FillAccessibleStateSet(rStateSet); rStateSet.AddState(accessibility::AccessibleStateType::FOCUSABLE); } - } } // end of namespace sfx2::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/sidebar/AccessibleTitleBar.hxx b/sfx2/source/sidebar/AccessibleTitleBar.hxx index 8415b73dce29..9e6f6d1e5cb4 100644 --- a/sfx2/source/sidebar/AccessibleTitleBar.hxx +++ b/sfx2/source/sidebar/AccessibleTitleBar.hxx @@ -22,7 +22,6 @@ #include <toolkit/awt/vclxaccessiblecomponent.hxx> #include <com/sun/star/accessibility/XAccessible.hpp> - namespace sfx2 { namespace sidebar { class TitleBar; @@ -41,7 +40,6 @@ private: virtual ~AccessibleTitleBar (void); }; - } } // end of namespace sfx2::sidebar #endif diff --git a/sfx2/source/sidebar/AsynchronousCall.cxx b/sfx2/source/sidebar/AsynchronousCall.cxx index d7ffa6251675..7dee20afe958 100644 --- a/sfx2/source/sidebar/AsynchronousCall.cxx +++ b/sfx2/source/sidebar/AsynchronousCall.cxx @@ -19,7 +19,6 @@ #include "AsynchronousCall.hxx" #include <vcl/svapp.hxx> - namespace sfx2 { namespace sidebar { AsynchronousCall::AsynchronousCall (void) diff --git a/sfx2/source/sidebar/AsynchronousCall.hxx b/sfx2/source/sidebar/AsynchronousCall.hxx index 665a35b9bf5c..d18b8302b617 100644 --- a/sfx2/source/sidebar/AsynchronousCall.hxx +++ b/sfx2/source/sidebar/AsynchronousCall.hxx @@ -48,7 +48,6 @@ private: DECL_LINK(HandleUserCall, void*); }; - } } // end of namespace sfx2::sidebar #endif diff --git a/sfx2/source/sidebar/CommandInfoProvider.cxx b/sfx2/source/sidebar/CommandInfoProvider.cxx index 6b005ff92280..6ee034d65386 100644 --- a/sfx2/source/sidebar/CommandInfoProvider.cxx +++ b/sfx2/source/sidebar/CommandInfoProvider.cxx @@ -75,7 +75,6 @@ namespace }; } - namespace sfx2 { namespace sidebar { CommandInfoProvider& CommandInfoProvider::Instance (void) @@ -84,7 +83,6 @@ CommandInfoProvider& CommandInfoProvider::Instance (void) return aProvider; } - CommandInfoProvider::CommandInfoProvider (void) : mxContext(comphelper::getProcessComponentContext()), mxCachedDataFrame(), @@ -96,7 +94,6 @@ CommandInfoProvider::CommandInfoProvider (void) { } - CommandInfoProvider::~CommandInfoProvider (void) { if (mxFrameListener.is()) @@ -121,7 +118,6 @@ OUString CommandInfoProvider::GetLabelForCommand ( return sLabel; } - void CommandInfoProvider::SetFrame (const Reference<frame::XFrame>& rxFrame) { if (rxFrame != mxCachedDataFrame) @@ -145,7 +141,6 @@ void CommandInfoProvider::SetFrame (const Reference<frame::XFrame>& rxFrame) } } - Reference<ui::XAcceleratorConfiguration> CommandInfoProvider::GetDocumentAcceleratorConfiguration (void) { if ( ! mxCachedDocumentAcceleratorConfiguration.is()) @@ -177,7 +172,6 @@ Reference<ui::XAcceleratorConfiguration> CommandInfoProvider::GetDocumentAcceler return mxCachedDocumentAcceleratorConfiguration; } - Reference<ui::XAcceleratorConfiguration> CommandInfoProvider::GetModuleAcceleratorConfiguration (void) { if ( ! mxCachedModuleAcceleratorConfiguration.is()) @@ -199,7 +193,6 @@ Reference<ui::XAcceleratorConfiguration> CommandInfoProvider::GetModuleAccelerat return mxCachedModuleAcceleratorConfiguration; } - Reference<ui::XAcceleratorConfiguration> CommandInfoProvider::GetGlobalAcceleratorConfiguration (void) { // Get the global accelerator configuration. @@ -211,7 +204,6 @@ Reference<ui::XAcceleratorConfiguration> CommandInfoProvider::GetGlobalAccelerat return mxCachedGlobalAcceleratorConfiguration; } - OUString CommandInfoProvider::GetModuleIdentifier (void) { if (msCachedModuleIdentifier.getLength() == 0) @@ -222,7 +214,6 @@ OUString CommandInfoProvider::GetModuleIdentifier (void) return msCachedModuleIdentifier; } - OUString CommandInfoProvider::GetCommandShortcut (const OUString& rsCommandName) { OUString sShortcut; @@ -242,7 +233,6 @@ OUString CommandInfoProvider::GetCommandShortcut (const OUString& rsCommandName) return OUString(); } - OUString CommandInfoProvider::RetrieveShortcutsFromConfiguration( const Reference<ui::XAcceleratorConfiguration>& rxConfiguration, const OUString& rsCommandName) @@ -271,7 +261,6 @@ OUString CommandInfoProvider::RetrieveShortcutsFromConfiguration( return OUString(); } - Sequence<beans::PropertyValue> CommandInfoProvider::GetCommandProperties (const OUString& rsCommandName) { Sequence<beans::PropertyValue> aProperties; @@ -294,7 +283,6 @@ Sequence<beans::PropertyValue> CommandInfoProvider::GetCommandProperties (const return aProperties; } - OUString CommandInfoProvider::GetCommandLabel (const OUString& rsCommandName) { const Sequence<beans::PropertyValue> aProperties (GetCommandProperties(rsCommandName)); @@ -310,7 +298,6 @@ OUString CommandInfoProvider::GetCommandLabel (const OUString& rsCommandName) return OUString(); } - } } // end of namespace sfx2/framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/sidebar/Context.cxx b/sfx2/source/sidebar/Context.cxx index 3639be1f112b..630c8dbae39a 100644 --- a/sfx2/source/sidebar/Context.cxx +++ b/sfx2/source/sidebar/Context.cxx @@ -34,7 +34,6 @@ Context::Context (void) { } - Context::Context ( const ::rtl::OUString& rsApplication, const ::rtl::OUString& rsContext) @@ -43,7 +42,6 @@ Context::Context ( { } - sal_Int32 Context::EvaluateMatch ( const Context& rOther) const { @@ -62,22 +60,18 @@ sal_Int32 Context::EvaluateMatch ( return NoMatch; } - - bool Context::operator== (const Context& rOther) const { return msApplication.equals(rOther.msApplication) && msContext.equals(rOther.msContext); } - bool Context::operator!= (const Context& rOther) const { return ( ! msApplication.equals(rOther.msApplication)) || ( ! msContext.equals(rOther.msContext)); } - } } // end of namespace sfx2::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/sidebar/Context.hxx b/sfx2/source/sidebar/Context.hxx index 12ca19bf0f99..22fc590c8615 100644 --- a/sfx2/source/sidebar/Context.hxx +++ b/sfx2/source/sidebar/Context.hxx @@ -56,7 +56,6 @@ public: bool operator!= (const Context& rOther) const; }; - } } // end of namespace sfx2::sidebar #endif diff --git a/sfx2/source/sidebar/ContextChangeBroadcaster.cxx b/sfx2/source/sidebar/ContextChangeBroadcaster.cxx index 3153a58f4295..ea761f0bcf58 100644 --- a/sfx2/source/sidebar/ContextChangeBroadcaster.cxx +++ b/sfx2/source/sidebar/ContextChangeBroadcaster.cxx @@ -24,40 +24,33 @@ #include <osl/diagnose.h> #include <comphelper/processfactory.hxx> - using ::rtl::OUString; using namespace css; using namespace css::uno; namespace sfx2 { namespace sidebar { - ContextChangeBroadcaster::ContextChangeBroadcaster (void) : msContextName(), mbIsBroadcasterEnabled(true) { } - 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) BroadcastContextChange(rxFrame, GetModuleName(rxFrame), msContextName); } - void ContextChangeBroadcaster::Deactivate (const css::uno::Reference<css::frame::XFrame>& rxFrame) { if (msContextName.getLength() > 0) @@ -69,7 +62,6 @@ void ContextChangeBroadcaster::Deactivate (const css::uno::Reference<css::frame: } } - bool ContextChangeBroadcaster::SetBroadcasterEnabled (const bool bIsEnabled) { const bool bWasEnabled (mbIsBroadcasterEnabled); @@ -77,7 +69,6 @@ bool ContextChangeBroadcaster::SetBroadcasterEnabled (const bool bIsEnabled) return bWasEnabled; } - void ContextChangeBroadcaster::BroadcastContextChange ( const css::uno::Reference<css::frame::XFrame>& rxFrame, const ::rtl::OUString& rsModuleName, @@ -108,7 +99,6 @@ void ContextChangeBroadcaster::BroadcastContextChange ( xMultiplexer->broadcastContextChangeEvent(aEvent, rxFrame->getController()); } - OUString ContextChangeBroadcaster::GetModuleName (const css::uno::Reference<css::frame::XFrame>& rxFrame) { if ( ! rxFrame.is() || ! rxFrame->getController().is()) @@ -126,7 +116,6 @@ OUString ContextChangeBroadcaster::GetModuleName (const css::uno::Reference<css: return OUString(); } - } } // 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 2a1480e0b67a..c46118a69e5f 100644 --- a/sfx2/source/sidebar/ContextList.cxx +++ b/sfx2/source/sidebar/ContextList.cxx @@ -23,18 +23,15 @@ using ::rtl::OUString; namespace sfx2 { namespace sidebar { - ContextList::ContextList (void) : maEntries() { } - ContextList::~ContextList (void) { } - const ContextList::Entry* ContextList::GetMatch (const Context& rContext) const { const ::std::vector<Entry>::const_iterator iEntry = FindBestMatch(rContext); @@ -44,7 +41,6 @@ const ContextList::Entry* ContextList::GetMatch (const Context& rContext) const return NULL; } - ContextList::Entry* ContextList::GetMatch (const Context& rContext) { const ::std::vector<Entry>::const_iterator iEntry = FindBestMatch(rContext); @@ -54,7 +50,6 @@ ContextList::Entry* ContextList::GetMatch (const Context& rContext) return NULL; } - ::std::vector<ContextList::Entry>::const_iterator ContextList::FindBestMatch (const Context& rContext) const { sal_Int32 nBestMatch (Context::NoMatch); @@ -79,7 +74,6 @@ ContextList::Entry* ContextList::GetMatch (const Context& rContext) return iBestMatch; } - void ContextList::AddContextDescription ( const Context& rContext, const bool bIsInitiallyVisible, @@ -91,7 +85,6 @@ void ContextList::AddContextDescription ( maEntries.back().msMenuCommand = rsMenuCommand; } - } } // end of namespace sfx2::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/sidebar/ContextList.hxx b/sfx2/source/sidebar/ContextList.hxx index 26b63caf19ba..47e561857515 100644 --- a/sfx2/source/sidebar/ContextList.hxx +++ b/sfx2/source/sidebar/ContextList.hxx @@ -25,7 +25,6 @@ #include <vector> - namespace sfx2 { namespace sidebar { /** Per context data for deck and panel descriptors. @@ -62,7 +61,6 @@ private: ::std::vector<Entry>::const_iterator FindBestMatch (const Context& rContext) const; }; - } } // end of namespace sfx2::sidebar #endif diff --git a/sfx2/source/sidebar/ControlFactory.cxx b/sfx2/source/sidebar/ControlFactory.cxx index 4071d981746e..23e17a671deb 100644 --- a/sfx2/source/sidebar/ControlFactory.cxx +++ b/sfx2/source/sidebar/ControlFactory.cxx @@ -23,10 +23,8 @@ #include <sfx2/sidebar/SidebarToolBox.hxx> #include <vcl/toolbox.hxx> - namespace sfx2 { namespace sidebar { - CheckBox* ControlFactory::CreateMenuButton (vcl::Window* pParentWindow) { return new MenuButton(pParentWindow); diff --git a/sfx2/source/sidebar/ControllerFactory.cxx b/sfx2/source/sidebar/ControllerFactory.cxx index 90ea9ccdf6f4..c635751e6809 100644 --- a/sfx2/source/sidebar/ControllerFactory.cxx +++ b/sfx2/source/sidebar/ControllerFactory.cxx @@ -31,12 +31,10 @@ #include <comphelper/processfactory.hxx> #include <toolkit/helper/vclunohelper.hxx> - using namespace css; using namespace css::uno; using ::rtl::OUString; - namespace sfx2 { namespace sidebar { Reference<frame::XToolbarController> ControllerFactory::CreateToolBoxController( @@ -135,7 +133,6 @@ Reference<frame::XToolbarController> ControllerFactory::CreateToolBoxController( return xController; } - 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 584507692ef9..db7f155b0879 100644 --- a/sfx2/source/sidebar/ControllerItem.cxx +++ b/sfx2/source/sidebar/ControllerItem.cxx @@ -31,11 +31,9 @@ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XFrameActionListener.hpp> - using namespace css; using namespace css::uno; - namespace { typedef ::cppu::WeakComponentImplHelper1 < @@ -103,7 +101,6 @@ ControllerItem::ControllerItem ( { } - ControllerItem::ControllerItem ( const sal_uInt16 nSlotId, SfxBindings &rBindings, @@ -118,16 +115,12 @@ ControllerItem::ControllerItem ( { } - ControllerItem::~ControllerItem (void) { if (mxFrameActionListener.is()) mxFrameActionListener->dispose(); } - - - void ControllerItem::StateChanged ( sal_uInt16 nSID, SfxItemState eState, @@ -136,9 +129,6 @@ void ControllerItem::StateChanged ( mrItemUpdateReceiver.NotifyItemUpdate(nSID, eState, pState, IsEnabled(eState)); } - - - bool ControllerItem::IsEnabled (SfxItemState eState) const { if (eState == SfxItemState::DISABLED) @@ -163,7 +153,6 @@ bool ControllerItem::IsEnabled (SfxItemState eState) const return true; } - void ControllerItem::RequestUpdate (void) { SfxPoolItem* pState = NULL; @@ -171,20 +160,16 @@ void ControllerItem::RequestUpdate (void) mrItemUpdateReceiver.NotifyItemUpdate(GetId(), eState, pState, IsEnabled(eState)); } - void ControllerItem::NotifyFrameContextChange (void) { RequestUpdate(); } - void ControllerItem::ResetFrame (void) { mxFrame = NULL; } - - ::rtl::OUString ControllerItem::GetLabel (void) const { return CommandInfoProvider::Instance().GetLabelForCommand( @@ -192,7 +177,6 @@ void ControllerItem::ResetFrame (void) mxFrame); } - ::rtl::OUString ControllerItem::GetHelpText (void) const { Help* pHelp = Application::GetHelp(); @@ -207,19 +191,15 @@ void ControllerItem::ResetFrame (void) return ::rtl::OUString(); } - - Image ControllerItem::GetIcon (void) const { return GetImage(mxFrame, ".uno:" + msCommandName, false); } - ControllerItem::ItemUpdateReceiverInterface::~ItemUpdateReceiverInterface() { } - void ControllerItem::SetupToolBoxItem (ToolBox& rToolBox, const sal_uInt16 nIndex) { rToolBox.SetQuickHelpText(nIndex, GetLabel()); @@ -227,7 +207,6 @@ void ControllerItem::SetupToolBoxItem (ToolBox& rToolBox, const sal_uInt16 nInde rToolBox.SetItemImage(nIndex, GetIcon()); } - } } // end of namespace sfx2::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx index 5bffefc7ed9d..c114a937003c 100644 --- a/sfx2/source/sidebar/Deck.cxx +++ b/sfx2/source/sidebar/Deck.cxx @@ -37,7 +37,6 @@ using namespace css; using namespace css::uno; - namespace sfx2 { namespace sidebar { Deck::Deck ( @@ -74,8 +73,6 @@ Deck::Deck ( #endif } - - Deck::~Deck (void) { Dispose(); @@ -86,7 +83,6 @@ Deck::~Deck (void) maPanels.clear(); } - void Deck::Dispose (void) { SharedPanelContainer aPanels; @@ -110,13 +106,11 @@ void Deck::Dispose (void) mpVerticalScrollBar.reset(); } - DeckTitleBar* Deck::GetTitleBar (void) const { return mpTitleBar.get(); } - Rectangle Deck::GetContentArea (void) const { const Size aWindowSize (GetSizePixel()); @@ -168,7 +162,6 @@ void Deck::Paint (const Rectangle& rUpdateArea) Theme::GetPaint(Theme::Paint_VerticalBorder)); } - void Deck::DataChanged (const DataChangedEvent& rEvent) { (void)rEvent; @@ -273,7 +266,6 @@ void Deck::ShowPanel (const Panel& rPanel) } } - const OUString GetWindowClassification (const vcl::Window* pWindow) { const OUString& rsName (pWindow->GetText()); @@ -287,7 +279,6 @@ const OUString GetWindowClassification (const vcl::Window* pWindow) } } - void Deck::PrintWindowSubTree (vcl::Window* pRoot, int nIndentation) { static const char* sIndentation = " "; @@ -323,7 +314,6 @@ IMPL_LINK(Deck, HandleVerticalScrollBarChange,void*, EMPTYARG) return sal_True; } - //----- Deck::ScrollContainerWindow ------------------------------------------- Deck::ScrollContainerWindow::ScrollContainerWindow (vcl::Window* pParentWindow) @@ -335,12 +325,10 @@ Deck::ScrollContainerWindow::ScrollContainerWindow (vcl::Window* pParentWindow) #endif } - Deck::ScrollContainerWindow::~ScrollContainerWindow (void) { } - void Deck::ScrollContainerWindow::Paint (const Rectangle& rUpdateArea) { (void)rUpdateArea; @@ -364,13 +352,11 @@ void Deck::ScrollContainerWindow::Paint (const Rectangle& rUpdateArea) } } - void Deck::ScrollContainerWindow::SetSeparators (const ::std::vector<sal_Int32>& rSeparators) { maSeparators = rSeparators; } - } } // end of namespace sfx2::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/sidebar/Deck.hxx b/sfx2/source/sidebar/Deck.hxx index b162a4373787..215bb3be1490 100644 --- a/sfx2/source/sidebar/Deck.hxx +++ b/sfx2/source/sidebar/Deck.hxx @@ -35,7 +35,6 @@ namespace sfx2 { namespace sidebar { class DeckDescriptor; class DeckTitleBar; - /** This is the parent window of the panels. It displays the deck title. */ diff --git a/sfx2/source/sidebar/DeckDescriptor.cxx b/sfx2/source/sidebar/DeckDescriptor.cxx index 400c775a4fde..13396112144e 100644 --- a/sfx2/source/sidebar/DeckDescriptor.cxx +++ b/sfx2/source/sidebar/DeckDescriptor.cxx @@ -36,7 +36,6 @@ DeckDescriptor::DeckDescriptor (void) { } - DeckDescriptor::DeckDescriptor (const DeckDescriptor& rOther) : msTitle(rOther.msTitle), msId(rOther.msId), @@ -52,7 +51,6 @@ DeckDescriptor::DeckDescriptor (const DeckDescriptor& rOther) { } - DeckDescriptor::~DeckDescriptor (void) { } diff --git a/sfx2/source/sidebar/DeckDescriptor.hxx b/sfx2/source/sidebar/DeckDescriptor.hxx index 318f65adf500..fc3f09f9debd 100644 --- a/sfx2/source/sidebar/DeckDescriptor.hxx +++ b/sfx2/source/sidebar/DeckDescriptor.hxx @@ -23,7 +23,6 @@ #include "ContextList.hxx" #include <boost/shared_ptr.hpp> - namespace sfx2 { namespace sidebar { class DeckDescriptor diff --git a/sfx2/source/sidebar/DeckLayouter.cxx b/sfx2/source/sidebar/DeckLayouter.cxx index 01dc10389bae..7be55137b084 100644 --- a/sfx2/source/sidebar/DeckLayouter.cxx +++ b/sfx2/source/sidebar/DeckLayouter.cxx @@ -29,10 +29,8 @@ using namespace css; using namespace css::uno; - namespace sfx2 { namespace sidebar { - namespace { static const sal_Int32 MinimalPanelHeight (25); @@ -102,7 +100,6 @@ namespace { iterator_name!=iEnd; \ ++iterator_name) - void DeckLayouter::LayoutDeck ( const Rectangle aContentArea, sal_Int32& rMinimalWidth, @@ -246,7 +243,6 @@ Rectangle LayoutPanels ( return aBox; } - sal_Int32 PlacePanels ( ::std::vector<LayoutItem>& rLayoutItems, const sal_Int32 nWidth, @@ -339,7 +335,6 @@ sal_Int32 PlacePanels ( return nY; } - void GetRequestedSizes ( ::std::vector<LayoutItem>& rLayoutItems, sal_Int32& rAvailableHeight, @@ -392,7 +387,6 @@ void GetRequestedSizes ( } } - void DistributeHeights ( ::std::vector<LayoutItem>& rLayoutItems, const sal_Int32 nHeightToDistribute, @@ -475,7 +469,6 @@ void DistributeHeights ( OSL_ASSERT(nRemainingHeightToDistribute==0); } - Rectangle PlaceDeckTitle ( vcl::Window& rDeckTitleBar, const Rectangle& rAvailableSpace) @@ -503,7 +496,6 @@ Rectangle PlaceDeckTitle ( } } - Rectangle PlaceVerticalScrollBar ( ScrollBar& rVerticalScrollBar, const Rectangle& rAvailableSpace, @@ -531,7 +523,6 @@ Rectangle PlaceVerticalScrollBar ( } } - void SetupVerticalScrollBar( ScrollBar& rVerticalScrollBar, const sal_Int32 nContentHeight, @@ -544,7 +535,6 @@ void SetupVerticalScrollBar( rVerticalScrollBar.SetVisibleSize(nVisibleHeight); } - void UpdateFiller ( vcl::Window& rFiller, const Rectangle& rBox) diff --git a/sfx2/source/sidebar/DeckLayouter.hxx b/sfx2/source/sidebar/DeckLayouter.hxx index 9421829e33b0..7d57e8ec6903 100644 --- a/sfx2/source/sidebar/DeckLayouter.hxx +++ b/sfx2/source/sidebar/DeckLayouter.hxx @@ -34,7 +34,6 @@ namespace sfx2 { namespace sidebar { class Panel; - /** Helper for layouting the direct and indirect children of a deck like title bars, panels, and scroll bars. */ @@ -51,7 +50,6 @@ namespace DeckLayouter ScrollBar& pVerticalScrollBar); } - } } // end of namespace sfx2::sidebar #endif diff --git a/sfx2/source/sidebar/DeckTitleBar.cxx b/sfx2/source/sidebar/DeckTitleBar.cxx index c57ba63987b4..0294ce930788 100644 --- a/sfx2/source/sidebar/DeckTitleBar.cxx +++ b/sfx2/source/sidebar/DeckTitleBar.cxx @@ -28,13 +28,11 @@ #include <sfx2/sidebar/Tools.hxx> #endif - namespace sfx2 { namespace sidebar { static const sal_Int32 gaLeftGripPadding (3); static const sal_Int32 gaRightGripPadding (3); - DeckTitleBar::DeckTitleBar ( const ::rtl::OUString& rsTitle, vcl::Window* pParentWindow, @@ -54,12 +52,10 @@ DeckTitleBar::DeckTitleBar ( #endif } - DeckTitleBar::~DeckTitleBar (void) { } - void DeckTitleBar::SetCloserVisible (const bool bIsCloserVisible) { if (mbIsCloserVisible != bIsCloserVisible) @@ -81,7 +77,6 @@ void DeckTitleBar::SetCloserVisible (const bool bIsCloserVisible) } } - Rectangle DeckTitleBar::GetTitleArea (const Rectangle& rTitleBarBox) { Image aGripImage (Theme::GetImage(Theme::Image_Grip)); @@ -92,25 +87,21 @@ Rectangle DeckTitleBar::GetTitleArea (const Rectangle& rTitleBarBox) rTitleBarBox.Bottom()); } - 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) @@ -118,8 +109,6 @@ void DeckTitleBar::HandleToolBoxItemClick (const sal_uInt16 nItemIndex) maCloserAction(); } - - css::uno::Reference<css::accessibility::XAccessible> DeckTitleBar::CreateAccessible (void) { const ::rtl::OUString sAccessibleName(msTitle); @@ -128,7 +117,6 @@ css::uno::Reference<css::accessibility::XAccessible> DeckTitleBar::CreateAccessi return TitleBar::CreateAccessible(); } - void DeckTitleBar::DataChanged (const DataChangedEvent& rEvent) { maToolBox.SetItemImage( @@ -137,7 +125,6 @@ void DeckTitleBar::DataChanged (const DataChangedEvent& rEvent) TitleBar::DataChanged(rEvent); } - } } // end of namespace sfx2::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/sidebar/DeckTitleBar.hxx b/sfx2/source/sidebar/DeckTitleBar.hxx index 6717ca28caa4..5f163caf1c56 100644 --- a/sfx2/source/sidebar/DeckTitleBar.hxx +++ b/sfx2/source/sidebar/DeckTitleBar.hxx @@ -23,7 +23,6 @@ #include <boost/function.hpp> - namespace sfx2 { namespace sidebar { class DeckTitleBar diff --git a/sfx2/source/sidebar/DrawHelper.hxx b/sfx2/source/sidebar/DrawHelper.hxx index 9357891f1e39..28c7b1f5e9b9 100644 --- a/sfx2/source/sidebar/DrawHelper.hxx +++ b/sfx2/source/sidebar/DrawHelper.hxx @@ -62,7 +62,6 @@ public: const Paint& rFillPaint); }; - } } // end of namespace sfx2::sidebar #endif diff --git a/sfx2/source/sidebar/EnumContext.cxx b/sfx2/source/sidebar/EnumContext.cxx index 32059da40691..e27d78fe8e73 100644 --- a/sfx2/source/sidebar/EnumContext.cxx +++ b/sfx2/source/sidebar/EnumContext.cxx @@ -41,14 +41,12 @@ static ContextVector maContextVector; const sal_Int32 EnumContext::NoMatch = 4; const sal_Int32 EnumContext::OptimalMatch = 0; // Neither application nor context name is "any". - EnumContext::EnumContext (void) : meApplication(Application_None), meContext(Context_Unknown) { } - EnumContext::EnumContext ( const Application eApplication, const Context eContext) @@ -57,7 +55,6 @@ EnumContext::EnumContext ( { } - EnumContext::EnumContext ( const ::rtl::OUString& rsApplicationName, const ::rtl::OUString& rsContextName) @@ -66,13 +63,11 @@ EnumContext::EnumContext ( { } - sal_Int32 EnumContext::GetCombinedContext_DI (void) const { return CombinedEnumContext(GetApplication_DI(), meContext); } - EnumContext::Application EnumContext::GetApplication_DI (void) const { switch (meApplication) @@ -100,15 +95,12 @@ bool EnumContext::operator== (const EnumContext aOther) && meContext==aOther.meContext; } - bool EnumContext::operator!= (const EnumContext aOther) { return meApplication!=aOther.meApplication || meContext!=aOther.meContext; } - - void EnumContext::AddEntry (const ::rtl::OUString& rsName, const Application eApplication) { maApplicationMap[rsName] = eApplication; @@ -118,7 +110,6 @@ void EnumContext::AddEntry (const ::rtl::OUString& rsName, const Application eAp maApplicationVector[eApplication]=rsName; } - void EnumContext::ProvideApplicationContainers (void) { if (maApplicationMap.empty()) @@ -139,7 +130,6 @@ void EnumContext::ProvideApplicationContainers (void) } } - EnumContext::Application EnumContext::GetApplicationEnum (const ::rtl::OUString& rsApplicationName) { ProvideApplicationContainers(); @@ -152,7 +142,6 @@ EnumContext::Application EnumContext::GetApplicationEnum (const ::rtl::OUString& return EnumContext::Application_None; } - const ::rtl::OUString& EnumContext::GetApplicationName (const Application eApplication) { ProvideApplicationContainers(); @@ -164,7 +153,6 @@ const ::rtl::OUString& EnumContext::GetApplicationName (const Application eAppli return maApplicationVector[nIndex]; } - void EnumContext::AddEntry (const ::rtl::OUString& rsName, const Context eApplication) { maContextMap[rsName] = eApplication; @@ -174,7 +162,6 @@ void EnumContext::AddEntry (const ::rtl::OUString& rsName, const Context eApplic maContextVector[eApplication] = rsName; } - void EnumContext::ProvideContextContainers (void) { if (maContextMap.empty()) @@ -213,7 +200,6 @@ void EnumContext::ProvideContextContainers (void) } } - EnumContext::Context EnumContext::GetContextEnum (const ::rtl::OUString& rsContextName) { ProvideContextContainers(); @@ -226,7 +212,6 @@ EnumContext::Context EnumContext::GetContextEnum (const ::rtl::OUString& rsConte return EnumContext::Context_Unknown; } - const ::rtl::OUString& EnumContext::GetContextName (const Context eContext) { ProvideContextContainers(); @@ -238,7 +223,6 @@ const ::rtl::OUString& EnumContext::GetContextName (const Context eContext) return maContextVector[nIndex]; } - } } // end of namespace sfx2::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/sidebar/FocusManager.cxx b/sfx2/source/sidebar/FocusManager.cxx index 6b1406184a8d..af116e67c605 100644 --- a/sfx2/source/sidebar/FocusManager.cxx +++ b/sfx2/source/sidebar/FocusManager.cxx @@ -27,7 +27,6 @@ #include <vcl/toolbox.hxx> #include <toolkit/helper/vclunohelper.hxx> - namespace sfx2 { namespace sidebar { FocusManager::FocusLocation::FocusLocation (const PanelComponent eComponent, const sal_Int32 nIndex) @@ -36,7 +35,6 @@ FocusManager::FocusLocation::FocusLocation (const PanelComponent eComponent, con { } - FocusManager::FocusManager (const ::boost::function<void(const Panel&)>& rShowPanelFunctor) : mpDeckTitleBar(), maPanels(), @@ -48,19 +46,16 @@ FocusManager::FocusManager (const ::boost::function<void(const Panel&)>& rShowPa { } - FocusManager::~FocusManager (void) { Clear(); } - void FocusManager::GrabFocus (void) { FocusDeckTitle(); } - void FocusManager::Clear (void) { SetDeckTitle(NULL); @@ -68,7 +63,6 @@ void FocusManager::Clear (void) ClearButtons(); } - void FocusManager::ClearPanels (void) { ::std::vector<Panel*> aPanels; @@ -88,7 +82,6 @@ void FocusManager::ClearPanels (void) } } - void FocusManager::ClearButtons (void) { ::std::vector<Button*> aButtons; @@ -101,7 +94,6 @@ void FocusManager::ClearButtons (void) } } - void FocusManager::SetDeckTitle (DeckTitleBar* pDeckTitleBar) { if (mpDeckTitleBar != NULL) @@ -118,7 +110,6 @@ void FocusManager::SetDeckTitle (DeckTitleBar* pDeckTitleBar) } } - void FocusManager::SetPanels (const SharedPanelContainer& rPanels) { ClearPanels(); @@ -140,7 +131,6 @@ void FocusManager::SetPanels (const SharedPanelContainer& rPanels) } } - void FocusManager::SetButtons (const ::std::vector<Button*>& rButtons) { ClearButtons(); @@ -153,19 +143,16 @@ 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. @@ -218,13 +205,11 @@ void FocusManager::FocusDeckTitle (void) FocusPanel(0, false); } - 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())) @@ -236,7 +221,6 @@ bool FocusManager::IsPanelTitleVisible (const sal_Int32 nPanelIndex) const return pTitleBar->IsVisible(); } - void FocusManager::FocusPanel ( const sal_Int32 nPanelIndex, const bool bFallbackToDeckTitle) @@ -274,7 +258,6 @@ void FocusManager::FocusPanel ( maShowPanelFunctor(rPanel); } - void FocusManager::FocusPanelContent (const sal_Int32 nPanelIndex) { vcl::Window* pWindow = VCLUnoHelper::GetWindow(maPanels[nPanelIndex]->GetElementWindow()); @@ -286,14 +269,12 @@ void FocusManager::FocusPanelContent (const sal_Int32 nPanelIndex) } } - void FocusManager::FocusButton (const sal_Int32 nButtonIndex) { maButtons[nButtonIndex]->GrabFocus(); maButtons[nButtonIndex]->Invalidate(); } - void FocusManager::ClickButton (const sal_Int32 nButtonIndex) { maButtons[nButtonIndex]->Click(); @@ -303,7 +284,6 @@ void FocusManager::ClickButton (const sal_Int32 nButtonIndex) maButtons[nButtonIndex]->GetParent()->Invalidate(); } - void FocusManager::RemoveWindow (vcl::Window& rWindow) { ::std::vector<Panel*>::iterator iPanel (::std::find(maPanels.begin(), maPanels.end(), &rWindow)); @@ -328,7 +308,6 @@ void FocusManager::RemoveWindow (vcl::Window& rWindow) } } - bool FocusManager::MoveFocusInsidePanel ( const FocusLocation& rFocusLocation, const sal_Int32 nDirection) @@ -356,7 +335,6 @@ bool FocusManager::MoveFocusInsidePanel ( } } - bool FocusManager::MoveFocusInsideDeckTitle ( const FocusLocation& rFocusLocation, const sal_Int32 nDirection) @@ -388,7 +366,6 @@ bool FocusManager::MoveFocusInsideDeckTitle ( } } - void FocusManager::HandleKeyEvent ( const vcl::KeyCode& rKeyCode, const vcl::Window& rWindow) @@ -538,7 +515,6 @@ void FocusManager::HandleKeyEvent ( } } - IMPL_LINK(FocusManager, WindowEventListener, VclSimpleEvent*, pEvent) { if (pEvent == NULL) @@ -577,7 +553,6 @@ IMPL_LINK(FocusManager, WindowEventListener, VclSimpleEvent*, pEvent) return 0; } - IMPL_LINK(FocusManager, ChildEventListener, VclSimpleEvent*, pEvent) { if (pEvent == NULL) @@ -654,7 +629,6 @@ IMPL_LINK(FocusManager, ChildEventListener, VclSimpleEvent*, pEvent) return 0; } - } } // end of namespace sfx2::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/sidebar/IContextChangeReceiver.cxx b/sfx2/source/sidebar/IContextChangeReceiver.cxx index aa3d4ec80b17..a592b8275b6e 100644 --- a/sfx2/source/sidebar/IContextChangeReceiver.cxx +++ b/sfx2/source/sidebar/IContextChangeReceiver.cxx @@ -18,10 +18,8 @@ */ #include <sfx2/sidebar/IContextChangeReceiver.hxx> - namespace sfx2 { namespace sidebar { - IContextChangeReceiver::~IContextChangeReceiver (void) { } diff --git a/sfx2/source/sidebar/ILayoutableWindow.cxx b/sfx2/source/sidebar/ILayoutableWindow.cxx index 252c26ce921b..1b4cd53710cc 100644 --- a/sfx2/source/sidebar/ILayoutableWindow.cxx +++ b/sfx2/source/sidebar/ILayoutableWindow.cxx @@ -18,10 +18,8 @@ */ #include <sfx2/sidebar/ILayoutableWindow.hxx> - namespace sfx2 { namespace sidebar { - ILayoutableWindow::~ILayoutableWindow (void) { } diff --git a/sfx2/source/sidebar/MenuButton.cxx b/sfx2/source/sidebar/MenuButton.cxx index e9099fe661cb..36d5a4c75236 100644 --- a/sfx2/source/sidebar/MenuButton.cxx +++ b/sfx2/source/sidebar/MenuButton.cxx @@ -27,10 +27,8 @@ using namespace css; using namespace css::uno; - namespace sfx2 { namespace sidebar { - MenuButton::MenuButton (vcl::Window* pParentWindow) : CheckBox(pParentWindow), mbIsLeftButtonDown(false), @@ -41,13 +39,10 @@ MenuButton::MenuButton (vcl::Window* pParentWindow) #endif } - - MenuButton::~MenuButton (void) { } - void MenuButton::Paint (const Rectangle& rUpdateArea) { switch(mePaintType) @@ -85,7 +80,6 @@ void MenuButton::Paint (const Rectangle& rUpdateArea) } } - void MenuButton::MouseMove (const MouseEvent& rEvent) { if (rEvent.IsEnterWindow() || rEvent.IsLeaveWindow()) @@ -93,7 +87,6 @@ void MenuButton::MouseMove (const MouseEvent& rEvent) CheckBox::MouseMove(rEvent); } - void MenuButton::MouseButtonDown (const MouseEvent& rMouseEvent) { if (rMouseEvent.IsLeft()) @@ -104,7 +97,6 @@ void MenuButton::MouseButtonDown (const MouseEvent& rMouseEvent) } } - void MenuButton::MouseButtonUp (const MouseEvent& rMouseEvent) { if (IsMouseCaptured()) @@ -126,7 +118,6 @@ void MenuButton::MouseButtonUp (const MouseEvent& rMouseEvent) } } - } } // end of namespace sfx2::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/sidebar/MenuButton.hxx b/sfx2/source/sidebar/MenuButton.hxx index 0077c2417dbe..1be374ebf7f7 100644 --- a/sfx2/source/sidebar/MenuButton.hxx +++ b/sfx2/source/sidebar/MenuButton.hxx @@ -21,7 +21,6 @@ #include <vcl/button.hxx> - namespace sfx2 { namespace sidebar { class MenuButton @@ -47,7 +46,6 @@ private: } mePaintType; }; - } } // end of namespace sfx2::sidebar #endif diff --git a/sfx2/source/sidebar/Paint.cxx b/sfx2/source/sidebar/Paint.cxx index 9daf7c0ad363..2d3fe7d2a8c2 100644 --- a/sfx2/source/sidebar/Paint.cxx +++ b/sfx2/source/sidebar/Paint.cxx @@ -20,7 +20,6 @@ #include <sfx2/sidebar/Tools.hxx> #include <com/sun/star/awt/Gradient.hpp> - using namespace css; namespace sfx2 { namespace sidebar { @@ -30,21 +29,18 @@ Paint::Paint (void) { } - Paint::Paint (const Color& rColor) : meType(ColorPaint), maValue(rColor) { } - Paint::Paint (const Gradient& rGradient) : meType(GradientPaint), maValue(rGradient) { } - Paint Paint::Create (const css::uno::Any& rValue) { ColorData aColor (0); @@ -58,8 +54,6 @@ Paint Paint::Create (const css::uno::Any& rValue) return Paint(); } - - const Color& Paint::GetColor (void) const { if (meType != ColorPaint) @@ -72,7 +66,6 @@ const Color& Paint::GetColor (void) const return ::boost::get<Color>(maValue); } - const Gradient& Paint::GetGradient (void) const { if (meType != GradientPaint) @@ -85,7 +78,6 @@ const Gradient& Paint::GetGradient (void) const return ::boost::get<Gradient>(maValue); } - Wallpaper Paint::GetWallpaper (void) const { switch (meType) @@ -105,7 +97,6 @@ Wallpaper Paint::GetWallpaper (void) const } } - } } // end of namespace sfx2::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/sidebar/Paint.hxx b/sfx2/source/sidebar/Paint.hxx index df381dfdb1d3..8c1445f3940f 100644 --- a/sfx2/source/sidebar/Paint.hxx +++ b/sfx2/source/sidebar/Paint.hxx @@ -26,7 +26,6 @@ #include <boost/variant.hpp> - namespace sfx2 { namespace sidebar { /** Abstraction of different ways to fill outlines. @@ -72,7 +71,6 @@ private: > maValue; }; - } } // end of namespace sfx2::sidebar #endif diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx index 769f8cc513ba..f7666e794599 100644 --- a/sfx2/source/sidebar/Panel.cxx +++ b/sfx2/source/sidebar/Panel.cxx @@ -38,11 +38,9 @@ #include <boost/bind.hpp> - using namespace css; using namespace css::uno; - namespace sfx2 { namespace sidebar { Panel::Panel ( @@ -71,14 +69,11 @@ Panel::Panel ( #endif } - Panel::~Panel (void) { Dispose(); } - - void Panel::Dispose (void) { mxPanelComponent = NULL; @@ -99,14 +94,11 @@ void Panel::Dispose (void) mpTitleBar.reset(); } - PanelTitleBar* Panel::GetTitleBar (void) const { return mpTitleBar.get(); } - - void Panel::SetUIElement (const Reference<ui::XUIElement>& rxElement) { mxElement = rxElement; @@ -116,7 +108,6 @@ void Panel::SetUIElement (const Reference<ui::XUIElement>& rxElement) } } - void Panel::SetExpanded (const bool bIsExpanded) { if (mbIsExpanded != bIsExpanded) @@ -132,21 +123,16 @@ void Panel::SetExpanded (const bool bIsExpanded) } } - - bool Panel::HasIdPredicate (const ::rtl::OUString& rsId) const { return msPanelId.equals(rsId); } - - void Panel::Paint (const Rectangle& rUpdateArea) { Window::Paint(rUpdateArea); } - void Panel::Resize (void) { Window::Resize(); @@ -165,21 +151,17 @@ void Panel::Resize (void) } } - void Panel::Activate (void) { Window::Activate(); } - void Panel::DataChanged (const DataChangedEvent& rEvent) { (void)rEvent; SetBackground(Theme::GetPaint(Theme::Paint_PanelBackground).GetWallpaper()); } - - Reference<awt::XWindow> Panel::GetElementWindow (void) { if (mxElement.is()) @@ -192,7 +174,6 @@ Reference<awt::XWindow> Panel::GetElementWindow (void) return NULL; } - } } // end of namespace sfx2::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/sidebar/Panel.hxx b/sfx2/source/sidebar/Panel.hxx index 2fea00bcfd56..219943cd7cc5 100644 --- a/sfx2/source/sidebar/Panel.hxx +++ b/sfx2/source/sidebar/Panel.hxx @@ -30,14 +30,12 @@ #include <boost/shared_ptr.hpp> #include <vector> - namespace sfx2 { namespace sidebar { class PanelDescriptor; class TitleBar; class PanelTitleBar; - class Panel : public vcl::Window { @@ -80,7 +78,6 @@ private: typedef ::boost::shared_ptr<Panel> SharedPanel; typedef ::std::vector<SharedPanel> SharedPanelContainer; - } } // end of namespace sfx2::sidebar #endif diff --git a/sfx2/source/sidebar/PanelDescriptor.cxx b/sfx2/source/sidebar/PanelDescriptor.cxx index b181ec731fd2..aad36f4f0aba 100644 --- a/sfx2/source/sidebar/PanelDescriptor.cxx +++ b/sfx2/source/sidebar/PanelDescriptor.cxx @@ -19,7 +19,6 @@ #include "PanelDescriptor.hxx" - namespace sfx2 { namespace sidebar { PanelDescriptor::PanelDescriptor (void) @@ -38,7 +37,6 @@ PanelDescriptor::PanelDescriptor (void) { } - PanelDescriptor::PanelDescriptor (const PanelDescriptor& rOther) : msTitle(rOther.msTitle), mbIsTitleBarOptional(rOther.mbIsTitleBarOptional), @@ -55,12 +53,10 @@ PanelDescriptor::PanelDescriptor (const PanelDescriptor& rOther) { } - PanelDescriptor::~PanelDescriptor (void) { } - } } // end of namespace sfx2::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/sidebar/PanelDescriptor.hxx b/sfx2/source/sidebar/PanelDescriptor.hxx index 29b4d6d86435..c2ae4afb44d9 100644 --- a/sfx2/source/sidebar/PanelDescriptor.hxx +++ b/sfx2/source/sidebar/PanelDescriptor.hxx @@ -23,7 +23,6 @@ #include "ContextList.hxx" #include <boost/shared_ptr.hpp> - namespace sfx2 { namespace sidebar { class PanelDescriptor diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx b/sfx2/source/sidebar/PanelTitleBar.cxx index 5888fa008134..5437c5312a0c 100644 --- a/sfx2/source/sidebar/PanelTitleBar.cxx +++ b/sfx2/source/sidebar/PanelTitleBar.cxx @@ -36,11 +36,9 @@ using namespace css::uno; namespace sfx2 { namespace sidebar { - static const sal_Int32 gaLeftIconPadding (5); static const sal_Int32 gaRightIconPadding (5); - PanelTitleBar::PanelTitleBar ( const ::rtl::OUString& rsTitle, vcl::Window* pParentWindow, @@ -60,13 +58,10 @@ PanelTitleBar::PanelTitleBar ( #endif } - - PanelTitleBar::~PanelTitleBar (void) { } - void PanelTitleBar::SetMoreOptionsCommand ( const ::rtl::OUString& rsCommandName, const css::uno::Reference<css::frame::XFrame>& rxFrame) @@ -101,7 +96,6 @@ void PanelTitleBar::SetMoreOptionsCommand ( } } - Rectangle PanelTitleBar::GetTitleArea (const Rectangle& rTitleBarBox) { if (mpPanel != NULL) @@ -119,7 +113,6 @@ Rectangle PanelTitleBar::GetTitleArea (const Rectangle& rTitleBarBox) return rTitleBarBox; } - void PanelTitleBar::PaintDecoration (const Rectangle& rTitleBarBox) { (void)rTitleBarBox; @@ -136,19 +129,16 @@ 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) @@ -169,7 +159,6 @@ void PanelTitleBar::HandleToolBoxItemClick (const sal_uInt16 nItemIndex) } } - Reference<accessibility::XAccessible> PanelTitleBar::CreateAccessible (void) { const ::rtl::OUString sAccessibleName(msAccessibleNamePrefix + msTitle); @@ -178,7 +167,6 @@ Reference<accessibility::XAccessible> PanelTitleBar::CreateAccessible (void) return TitleBar::CreateAccessible(); } - void PanelTitleBar::MouseButtonDown (const MouseEvent& rMouseEvent) { if (rMouseEvent.IsLeft()) @@ -188,7 +176,6 @@ void PanelTitleBar::MouseButtonDown (const MouseEvent& rMouseEvent) } } - void PanelTitleBar::MouseButtonUp (const MouseEvent& rMouseEvent) { if (IsMouseCaptured()) @@ -209,7 +196,6 @@ void PanelTitleBar::MouseButtonUp (const MouseEvent& rMouseEvent) mbIsLeftButtonDown = false; } - void PanelTitleBar::DataChanged (const DataChangedEvent& rEvent) { maToolBox.SetItemImage( diff --git a/sfx2/source/sidebar/PanelTitleBar.hxx b/sfx2/source/sidebar/PanelTitleBar.hxx index 57f9469dfa64..51af11d2c176 100644 --- a/sfx2/source/sidebar/PanelTitleBar.hxx +++ b/sfx2/source/sidebar/PanelTitleBar.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/frame/XFrame.hpp> #include <boost/function.hpp> - namespace sfx2 { namespace sidebar { class Panel; @@ -64,7 +63,6 @@ private: ::rtl::OUString msAccessibleNamePrefix; }; - } } // end of namespace sfx2::sidebar #endif diff --git a/sfx2/source/sidebar/PopupContainer.cxx b/sfx2/source/sidebar/PopupContainer.cxx index 621a8248fd01..0952765fb8b6 100644 --- a/sfx2/source/sidebar/PopupContainer.cxx +++ b/sfx2/source/sidebar/PopupContainer.cxx @@ -27,13 +27,10 @@ PopupContainer::PopupContainer (vcl::Window* pParent) { } - PopupContainer::~PopupContainer (void) { } - - long PopupContainer::Notify (NotifyEvent& rEvent) { if (rEvent.GetType() == MouseNotifyEvent::LOSEFOCUS) @@ -44,7 +41,6 @@ long PopupContainer::Notify (NotifyEvent& rEvent) return FloatingWindow::Notify(rEvent); } - } } // end of namespace sfx2::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/sidebar/ResourceManager.cxx b/sfx2/source/sidebar/ResourceManager.cxx index d4add6536b3d..570480391993 100644 --- a/sfx2/source/sidebar/ResourceManager.cxx +++ b/sfx2/source/sidebar/ResourceManager.cxx @@ -44,7 +44,6 @@ ResourceManager& ResourceManager::Instance (void) return maInstance; } - ResourceManager::ResourceManager (void) : maDecks(), maPanels(), @@ -54,14 +53,12 @@ ResourceManager::ResourceManager (void) ReadPanelList(); } - ResourceManager::~ResourceManager (void) { maPanels.clear(); maDecks.clear(); } - const DeckDescriptor* ResourceManager::GetDeckDescriptor ( const ::rtl::OUString& rsDeckId) const { @@ -77,7 +74,6 @@ const DeckDescriptor* ResourceManager::GetDeckDescriptor ( return NULL; } - const PanelDescriptor* ResourceManager::GetPanelDescriptor ( const ::rtl::OUString& rsPanelId) const { @@ -93,7 +89,6 @@ const PanelDescriptor* ResourceManager::GetPanelDescriptor ( return NULL; } - void ResourceManager::SetIsDeckEnabled ( const ::rtl::OUString& rsDeckId, const bool bIsEnabled) @@ -112,7 +107,6 @@ void ResourceManager::SetIsDeckEnabled ( } } - const ResourceManager::DeckContextDescriptorContainer& ResourceManager::GetMatchingDecks ( DeckContextDescriptorContainer& rDecks, const Context& rContext, @@ -153,7 +147,6 @@ const ResourceManager::DeckContextDescriptorContainer& ResourceManager::GetMatch return rDecks; } - const ResourceManager::PanelContextDescriptorContainer& ResourceManager::GetMatchingPanels ( PanelContextDescriptorContainer& rPanelIds, const Context& rContext, @@ -199,7 +192,6 @@ const ResourceManager::PanelContextDescriptorContainer& ResourceManager::GetMatc return rPanelIds; } - void ResourceManager::ReadDeckList (void) { const ::utl::OConfigurationTreeRoot aDeckRootNode ( @@ -252,7 +244,6 @@ void ResourceManager::ReadDeckList (void) maDecks.resize(nWriteIndex); } - void ResourceManager::ReadPanelList (void) { const ::utl::OConfigurationTreeRoot aPanelRootNode ( @@ -311,7 +302,6 @@ void ResourceManager::ReadPanelList (void) maPanels.resize(nWriteIndex); } - void ResourceManager::ReadContextList ( const ::utl::OConfigurationNode& rParentNode, ContextList& rContextList, @@ -456,7 +446,6 @@ void ResourceManager::ReadContextList ( } } - void ResourceManager::ReadLegacyAddons (const Reference<frame::XFrame>& rxFrame) { // Get module name for given frame. @@ -538,7 +527,6 @@ void ResourceManager::ReadLegacyAddons (const Reference<frame::XFrame>& rxFrame) maPanels.resize(nPanelWriteIndex); } - void ResourceManager::StorePanelExpansionState ( const ::rtl::OUString& rsPanelId, const bool bExpansionState, @@ -560,8 +548,6 @@ void ResourceManager::StorePanelExpansionState ( } } - - ::utl::OConfigurationTreeRoot ResourceManager::GetLegacyAddonRootNode ( const ::rtl::OUString& rsModuleName) const { @@ -591,7 +577,6 @@ void ResourceManager::StorePanelExpansionState ( return ::utl::OConfigurationTreeRoot(); } - void ResourceManager::GetToolPanelNodeNames ( ::std::vector<OUString>& rMatchingNames, const ::utl::OConfigurationTreeRoot& aRoot) const @@ -605,7 +590,6 @@ void ResourceManager::GetToolPanelNodeNames ( } } - bool ResourceManager::IsDeckEnabled ( const OUString& rsDeckId, const Context& rContext, @@ -633,7 +617,6 @@ bool ResourceManager::IsDeckEnabled ( return false; } - } } // end of namespace sfx2::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/sidebar/ResourceManager.hxx b/sfx2/source/sidebar/ResourceManager.hxx index 10dfdc28f507..c8e2d07678a0 100644 --- a/sfx2/source/sidebar/ResourceManager.hxx +++ b/sfx2/source/sidebar/ResourceManager.hxx @@ -27,7 +27,6 @@ #include <set> #include <boost/shared_ptr.hpp> - namespace sfx2 { namespace sidebar { class Context; @@ -125,7 +124,6 @@ private: const css::uno::Reference<css::frame::XFrame>& rxFrame) const; }; - } } // end of namespace sfx2::sidebar #endif diff --git a/sfx2/source/sidebar/Sidebar.cxx b/sfx2/source/sidebar/Sidebar.cxx index 5a0a8d784612..a74004846755 100644 --- a/sfx2/source/sidebar/Sidebar.cxx +++ b/sfx2/source/sidebar/Sidebar.cxx @@ -25,7 +25,6 @@ using namespace css; namespace sfx2 { namespace sidebar { - void Sidebar::ShowPanel ( const ::rtl::OUString& rsPanelId, const css::uno::Reference<frame::XFrame>& rxFrame) @@ -44,7 +43,6 @@ void Sidebar::ShowPanel ( } } - } } // end of namespace sfx2::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index b8a87338c0d1..eb2554df744d 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -55,7 +55,6 @@ #include <boost/function.hpp> #include <boost/scoped_array.hpp> - using namespace css; using namespace css::uno; using ::rtl::OUString; diff --git a/sfx2/source/sidebar/SidebarController.hxx b/sfx2/source/sidebar/SidebarController.hxx index 797e4073c9a9..15c694d85fea 100644 --- a/sfx2/source/sidebar/SidebarController.hxx +++ b/sfx2/source/sidebar/SidebarController.hxx @@ -45,8 +45,6 @@ #include <cppuhelper/basemutex.hxx> #include <cppuhelper/weakref.hxx> - - namespace { typedef ::cppu::WeakComponentImplHelper4 < @@ -252,7 +250,6 @@ private: virtual void SAL_CALL disposing (void) SAL_OVERRIDE; }; - } } // end of namespace sfx2::sidebar #endif diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx b/sfx2/source/sidebar/SidebarDockingWindow.cxx index 5f5fca14c8bb..914877262986 100644 --- a/sfx2/source/sidebar/SidebarDockingWindow.cxx +++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx @@ -27,10 +27,8 @@ using namespace css; using namespace css::uno; - namespace sfx2 { namespace sidebar { - SidebarDockingWindow::SidebarDockingWindow( SfxBindings* pSfxBindings, SidebarChildWindow& rChildWindow, @@ -53,13 +51,11 @@ SidebarDockingWindow::SidebarDockingWindow( } } - SidebarDockingWindow::~SidebarDockingWindow (void) { DoDispose(); } - void SidebarDockingWindow::DoDispose (void) { Reference<lang::XComponent> xComponent (static_cast<XWeak*>(mpSidebarController.get()), UNO_QUERY); @@ -70,7 +66,6 @@ void SidebarDockingWindow::DoDispose (void) } } - void SidebarDockingWindow::GetFocus() { if (mpSidebarController.is()) @@ -79,14 +74,12 @@ void SidebarDockingWindow::GetFocus() SfxDockingWindow::GetFocus(); } - // fdo#87217 bool SidebarDockingWindow::Close (void) { return SfxDockingWindow::Close(); } - SfxChildAlignment SidebarDockingWindow::CheckAlignment ( SfxChildAlignment eCurrentAlignment, SfxChildAlignment eRequestedAlignment) @@ -114,7 +107,6 @@ SfxChildAlignment SidebarDockingWindow::CheckAlignment ( } } - } } // end of namespace sfx2::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/sidebar/SidebarDockingWindow.hxx b/sfx2/source/sidebar/SidebarDockingWindow.hxx index 2c46e41cc31e..c15422601c9b 100644 --- a/sfx2/source/sidebar/SidebarDockingWindow.hxx +++ b/sfx2/source/sidebar/SidebarDockingWindow.hxx @@ -56,7 +56,6 @@ private: void DoDispose (void); }; - } } // end of namespace sfx2::sidebar diff --git a/sfx2/source/sidebar/SidebarPanelBase.cxx b/sfx2/source/sidebar/SidebarPanelBase.cxx index 537f166618e9..a1b54dba617e 100644 --- a/sfx2/source/sidebar/SidebarPanelBase.cxx +++ b/sfx2/source/sidebar/SidebarPanelBase.cxx @@ -31,7 +31,6 @@ using namespace css; using namespace css::uno; - namespace sfx2 { namespace sidebar { Reference<ui::XUIElement> SidebarPanelBase::Create ( @@ -49,7 +48,6 @@ Reference<ui::XUIElement> SidebarPanelBase::Create ( return xUIElement; } - SidebarPanelBase::SidebarPanelBase ( const ::rtl::OUString& rsResourceURL, const css::uno::Reference<css::frame::XFrame>& rxFrame, @@ -76,12 +74,10 @@ SidebarPanelBase::SidebarPanelBase ( } } - SidebarPanelBase::~SidebarPanelBase (void) { } - void SAL_CALL SidebarPanelBase::disposing (void) throw (css::uno::RuntimeException) { @@ -102,7 +98,6 @@ void SAL_CALL SidebarPanelBase::disposing (void) } } - // XContextChangeEventListener void SAL_CALL SidebarPanelBase::notifyContextChangeEvent ( const ui::ContextChangeEventObject& rEvent) @@ -119,7 +114,6 @@ void SAL_CALL SidebarPanelBase::notifyContextChangeEvent ( } } - void SAL_CALL SidebarPanelBase::disposing ( const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException, std::exception) @@ -130,35 +124,30 @@ void SAL_CALL SidebarPanelBase::disposing ( mpControl = NULL; } - css::uno::Reference<css::frame::XFrame> SAL_CALL SidebarPanelBase::getFrame (void) throw(css::uno::RuntimeException, std::exception) { return mxFrame; } - ::rtl::OUString SAL_CALL SidebarPanelBase::getResourceURL (void) throw(css::uno::RuntimeException, std::exception) { return msResourceURL; } - sal_Int16 SAL_CALL SidebarPanelBase::getType (void) throw(css::uno::RuntimeException, std::exception) { return ui::UIElementType::TOOLPANEL; } - Reference<XInterface> SAL_CALL SidebarPanelBase::getRealInterface (void) throw(css::uno::RuntimeException, std::exception) { return Reference<XInterface>(static_cast<XWeak*>(this)); } - Reference<accessibility::XAccessible> SAL_CALL SidebarPanelBase::createAccessible ( const Reference<accessibility::XAccessible>& rxParentAccessible) throw(css::uno::RuntimeException, std::exception) @@ -169,7 +158,6 @@ Reference<accessibility::XAccessible> SAL_CALL SidebarPanelBase::createAccessibl return NULL; } - Reference<awt::XWindow> SAL_CALL SidebarPanelBase::getWindow (void) throw(css::uno::RuntimeException, std::exception) { @@ -181,7 +169,6 @@ Reference<awt::XWindow> SAL_CALL SidebarPanelBase::getWindow (void) return NULL; } - ui::LayoutSize SAL_CALL SidebarPanelBase::getHeightForWidth (const sal_Int32 nWidth) throw(css::uno::RuntimeException, std::exception) { diff --git a/sfx2/source/sidebar/SidebarResource.hxx b/sfx2/source/sidebar/SidebarResource.hxx index a0396deb0e86..fb107a2ecb3a 100644 --- a/sfx2/source/sidebar/SidebarResource.hxx +++ b/sfx2/source/sidebar/SidebarResource.hxx @@ -19,12 +19,10 @@ #ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_SIDEBARRESOURCE_HXX #define INCLUDED_SFX2_SOURCE_SIDEBAR_SIDEBARRESOURCE_HXX - #include "Sidebar.hrc" #include <sfx2/sfxresid.hxx> #include <tools/rc.hxx> - class SidebarResource : public Resource { public: @@ -32,7 +30,6 @@ public: ~SidebarResource (void) { FreeResource(); } }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx index 45919411992b..023919f7cfbb 100644 --- a/sfx2/source/sidebar/SidebarToolBox.cxx +++ b/sfx2/source/sidebar/SidebarToolBox.cxx @@ -29,15 +29,12 @@ #include <framework/imageproducer.hxx> #include <com/sun/star/frame/XSubToolbarController.hpp> - using namespace css; using namespace css::uno; using ::rtl::OUString; - namespace sfx2 { namespace sidebar { - SidebarToolBox::SidebarToolBox (vcl::Window* pParentWindow) : ToolBox(pParentWindow, 0), maItemSeparator(Theme::GetImage(Theme::Image_ToolBoxItemSeparator)), @@ -115,7 +112,6 @@ void SidebarToolBox::Paint (const Rectangle& rRect) } } - bool SidebarToolBox::Notify (NotifyEvent& rEvent) { if (rEvent.GetType() == MouseNotifyEvent::KEYINPUT) @@ -131,7 +127,6 @@ bool SidebarToolBox::Notify (NotifyEvent& rEvent) return ToolBox::Notify(rEvent); } - void SidebarToolBox::CreateController ( const sal_uInt16 nItemId, const css::uno::Reference<css::frame::XFrame>& rxFrame, @@ -157,7 +152,6 @@ void SidebarToolBox::CreateController ( } } - Reference<frame::XToolbarController> SidebarToolBox::GetControllerForItemId (const sal_uInt16 nItemId) const { ControllerContainer::const_iterator iController (maControllers.find(nItemId)); @@ -167,7 +161,6 @@ Reference<frame::XToolbarController> SidebarToolBox::GetControllerForItemId (con return NULL; } - void SidebarToolBox::SetController( const sal_uInt16 nItemId, const css::uno::Reference<css::frame::XToolbarController>& rxController, @@ -196,7 +189,6 @@ void SidebarToolBox::SetController( RegisterHandlers(); } - sal_uInt16 SidebarToolBox::GetItemIdForSubToolbarName (const OUString& rsSubToolbarName) const { for (ControllerContainer::const_iterator iController(maControllers.begin()), iEnd(maControllers.end()); @@ -215,7 +207,6 @@ sal_uInt16 SidebarToolBox::GetItemIdForSubToolbarName (const OUString& rsSubTool return 0; } - void SidebarToolBox::RegisterHandlers (void) { if ( ! mbAreHandlersRegistered) @@ -230,7 +221,6 @@ void SidebarToolBox::RegisterHandlers (void) } } - IMPL_LINK(SidebarToolBox, DropDownClickHandler, ToolBox*, pToolBox) { if (pToolBox != NULL) @@ -246,7 +236,6 @@ IMPL_LINK(SidebarToolBox, DropDownClickHandler, ToolBox*, pToolBox) return 1; } - IMPL_LINK(SidebarToolBox, ClickHandler, ToolBox*, pToolBox) { if (pToolBox == NULL) @@ -259,7 +248,6 @@ IMPL_LINK(SidebarToolBox, ClickHandler, ToolBox*, pToolBox) return 1; } - IMPL_LINK(SidebarToolBox, DoubleClickHandler, ToolBox*, pToolBox) { if (pToolBox == NULL) @@ -272,7 +260,6 @@ IMPL_LINK(SidebarToolBox, DoubleClickHandler, ToolBox*, pToolBox) return 1; } - IMPL_LINK(SidebarToolBox, SelectHandler, ToolBox*, pToolBox) { if (pToolBox == NULL) @@ -285,20 +272,16 @@ IMPL_LINK(SidebarToolBox, SelectHandler, ToolBox*, pToolBox) return 1; } - IMPL_LINK(SidebarToolBox, ActivateToolBox, ToolBox*, EMPTYARG) { return 1; } - IMPL_LINK(SidebarToolBox, DeactivateToolBox, ToolBox*, EMPTYARG) { return 1; } - - } } // end of namespace sfx2::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx index 829f5f016cfb..d5196da235e4 100644 --- a/sfx2/source/sidebar/TabBar.cxx +++ b/sfx2/source/sidebar/TabBar.cxx @@ -34,13 +34,9 @@ #include <com/sun/star/graphic/XGraphicProvider.hpp> - using namespace css; using namespace css::uno; - - - namespace sfx2 { namespace sidebar { TabBar::TabBar ( @@ -66,12 +62,10 @@ TabBar::TabBar ( #endif } - TabBar::~TabBar (void) { } - void TabBar::Paint (const Rectangle& rUpdateArea) { Window::Paint(rUpdateArea); @@ -83,7 +77,6 @@ void TabBar::Paint (const Rectangle& rUpdateArea) Point(GetSizePixel().Width()-nHorizontalPadding, mnMenuSeparatorY)); } - sal_Int32 TabBar::GetDefaultWidth (void) { return Theme::GetInteger(Theme::Int_TabItemWidth) @@ -91,7 +84,6 @@ sal_Int32 TabBar::GetDefaultWidth (void) + Theme::GetInteger(Theme::Int_TabBarRightPadding); } - void TabBar::SetDecks ( const ResourceManager::DeckContextDescriptorContainer& rDecks) { @@ -136,7 +128,6 @@ void TabBar::SetDecks ( Layout(); } - void TabBar::UpdateButtonIcons (void) { Image aImage = Theme::GetImage(Theme::Image_TabBarMenu); @@ -171,7 +162,6 @@ void TabBar::UpdateButtonIcons (void) Invalidate(); } - void TabBar::Layout (void) { const SvBorder aPadding ( @@ -219,7 +209,6 @@ void TabBar::Layout (void) Invalidate(); } - void TabBar::HighlightDeck (const ::rtl::OUString& rsDeckId) { for (ItemContainer::iterator iItem(maItems.begin()),iEnd(maItems.end()); @@ -233,7 +222,6 @@ void TabBar::HighlightDeck (const ::rtl::OUString& rsDeckId) } } - void TabBar::RemoveDeckHighlight () { for (ItemContainer::iterator iItem(maItems.begin()),iEnd(maItems.end()); @@ -244,7 +232,6 @@ void TabBar::RemoveDeckHighlight () } } - void TabBar::DataChanged (const DataChangedEvent& rDataChangedEvent) { SetBackground(Theme::GetPaint(Theme::Paint_TabBarBackground).GetWallpaper()); @@ -253,14 +240,11 @@ void TabBar::DataChanged (const DataChangedEvent& rDataChangedEvent) Window::DataChanged(rDataChangedEvent); } - bool TabBar::Notify (NotifyEvent&) { return false; } - - RadioButton* TabBar::CreateTabItem (const DeckDescriptor& rDeckDescriptor) { RadioButton* pItem = ControlFactory::CreateTabItem(this); @@ -270,7 +254,6 @@ RadioButton* TabBar::CreateTabItem (const DeckDescriptor& rDeckDescriptor) return pItem; } - Image TabBar::GetItemImage (const DeckDescriptor& rDeckDescriptor) const { return Tools::GetImage( @@ -279,8 +262,6 @@ Image TabBar::GetItemImage (const DeckDescriptor& rDeckDescriptor) const mxFrame); } - - IMPL_LINK(TabBar::Item, HandleClick, Button*, EMPTYARG) { try @@ -292,7 +273,6 @@ IMPL_LINK(TabBar::Item, HandleClick, Button*, EMPTYARG) return 1; } - const ::rtl::OUString TabBar::GetDeckIdForIndex (const sal_Int32 nIndex) const { if (nIndex<0 || static_cast<size_t>(nIndex)>=maItems.size()) @@ -301,7 +281,6 @@ const ::rtl::OUString TabBar::GetDeckIdForIndex (const sal_Int32 nIndex) const return maItems[nIndex].msDeckId; } - void TabBar::ToggleHideFlag (const sal_Int32 nIndex) { if (nIndex<0 || static_cast<size_t>(nIndex)>=maItems.size()) @@ -316,7 +295,6 @@ void TabBar::ToggleHideFlag (const sal_Int32 nIndex) } } - void TabBar::RestoreHideFlags (void) { bool bNeedsLayout (false); @@ -334,7 +312,6 @@ void TabBar::RestoreHideFlags (void) Layout(); } - void TabBar::UpdateFocusManager (FocusManager& rFocusManager) { ::std::vector<Button*> aButtons; @@ -351,7 +328,6 @@ void TabBar::UpdateFocusManager (FocusManager& rFocusManager) rFocusManager.SetButtons(aButtons); } - IMPL_LINK(TabBar, OnToolboxClicked, void*, EMPTYARG) { if ( ! mpMenuButton) @@ -387,7 +363,6 @@ IMPL_LINK(TabBar, OnToolboxClicked, void*, EMPTYARG) return 0; } - } } // end of namespace sfx2::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/sidebar/TabBar.hxx b/sfx2/source/sidebar/TabBar.hxx index b9cdc556f9a5..97772749a1f3 100644 --- a/sfx2/source/sidebar/TabBar.hxx +++ b/sfx2/source/sidebar/TabBar.hxx @@ -34,8 +34,6 @@ class Button; class CheckBox; class RadioButton; - - namespace sfx2 { namespace sidebar { class FocusManager; diff --git a/sfx2/source/sidebar/TabItem.cxx b/sfx2/source/sidebar/TabItem.cxx index 335c8b498104..ec763a0250f9 100644 --- a/sfx2/source/sidebar/TabItem.cxx +++ b/sfx2/source/sidebar/TabItem.cxx @@ -28,10 +28,8 @@ using namespace css; using namespace css::uno; - namespace sfx2 { namespace sidebar { - TabItem::TabItem (vcl::Window* pParentWindow) : ImageRadioButton(pParentWindow), mbIsLeftButtonDown(false), @@ -44,12 +42,10 @@ TabItem::TabItem (vcl::Window* pParentWindow) #endif } - TabItem::~TabItem (void) { } - void TabItem::Paint (const Rectangle& rUpdateArea) { switch(mePaintType) @@ -87,8 +83,6 @@ void TabItem::Paint (const Rectangle& rUpdateArea) } } - - void TabItem::MouseMove (const MouseEvent& rEvent) { if (rEvent.IsEnterWindow() || rEvent.IsLeaveWindow()) @@ -96,7 +90,6 @@ void TabItem::MouseMove (const MouseEvent& rEvent) ImageRadioButton::MouseMove(rEvent); } - void TabItem::MouseButtonDown (const MouseEvent& rMouseEvent) { if (rMouseEvent.IsLeft()) @@ -107,7 +100,6 @@ void TabItem::MouseButtonDown (const MouseEvent& rMouseEvent) } } - void TabItem::MouseButtonUp (const MouseEvent& rMouseEvent) { if (IsMouseCaptured()) @@ -129,7 +121,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/TabItem.hxx b/sfx2/source/sidebar/TabItem.hxx index 7345f2e4a338..4d9521143185 100644 --- a/sfx2/source/sidebar/TabItem.hxx +++ b/sfx2/source/sidebar/TabItem.hxx @@ -49,7 +49,6 @@ private: } mePaintType; }; - } } // end of namespace sfx2::sidebar #endif diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx index 19268bd7d18c..e091ccbb240c 100644 --- a/sfx2/source/sidebar/Theme.cxx +++ b/sfx2/source/sidebar/Theme.cxx @@ -30,10 +30,8 @@ using namespace css; using namespace css::uno; - namespace sfx2 { namespace sidebar { - Theme& Theme::GetCurrentTheme() { return SfxGetpApp()->GetSidebarTheme(); @@ -58,12 +56,10 @@ Theme::Theme() SetupPropertyMaps(); } - Theme::~Theme (void) { } - Image Theme::GetImage (const ThemeItem eItem) { const PropertyType eType (GetPropertyType(eItem)); @@ -73,7 +69,6 @@ Image Theme::GetImage (const ThemeItem eItem) return rTheme.maImages[nIndex]; } - Color Theme::GetColor (const ThemeItem eItem) { const PropertyType eType (GetPropertyType(eItem)); @@ -88,7 +83,6 @@ Color Theme::GetColor (const ThemeItem eItem) return COL_WHITE; } - const Paint& Theme::GetPaint (const ThemeItem eItem) { const PropertyType eType (GetPropertyType(eItem)); @@ -98,13 +92,11 @@ const Paint& Theme::GetPaint (const ThemeItem eItem) return rTheme.maPaints[nIndex]; } - const Wallpaper Theme::GetWallpaper (const ThemeItem eItem) { return GetPaint(eItem).GetWallpaper(); } - sal_Int32 Theme::GetInteger (const ThemeItem eItem) { const PropertyType eType (GetPropertyType(eItem)); @@ -114,7 +106,6 @@ sal_Int32 Theme::GetInteger (const ThemeItem eItem) return rTheme.maIntegers[nIndex]; } - bool Theme::GetBoolean (const ThemeItem eItem) { const PropertyType eType (GetPropertyType(eItem)); @@ -124,14 +115,12 @@ bool Theme::GetBoolean (const ThemeItem eItem) return rTheme.maBooleans[nIndex]; } - bool Theme::IsHighContrastMode (void) { const Theme& rTheme (GetCurrentTheme()); return rTheme.mbIsHighContrastMode; } - void Theme::HandleDataChange (void) { Theme& rTheme (GetCurrentTheme()); @@ -146,7 +135,6 @@ void Theme::HandleDataChange (void) GetCurrentTheme().UpdateTheme(); } - void Theme::InitializeTheme (void) { setPropertyValue( @@ -157,7 +145,6 @@ void Theme::InitializeTheme (void) Any(false)); } - void Theme::UpdateTheme (void) { SidebarResource aLocalResource; @@ -353,7 +340,6 @@ void Theme::UpdateTheme (void) Any(true)); */ - // Gradient style Color aGradientStop2 (aBaseBackgroundColor); aGradientStop2.IncreaseLuminance(17); @@ -401,7 +387,6 @@ void Theme::UpdateTheme (void) } } - void SAL_CALL Theme::disposing (void) { ChangeListeners aListeners; @@ -432,13 +417,11 @@ 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) { @@ -510,7 +493,6 @@ Any SAL_CALL Theme::getPropertyValue ( return maRawValues[eItem]; } - void SAL_CALL Theme::addPropertyChangeListener( const ::rtl::OUString& rsPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener) @@ -536,7 +518,6 @@ void SAL_CALL Theme::addPropertyChangeListener( pListeners->push_back(rxListener); } - void SAL_CALL Theme::removePropertyChangeListener( const ::rtl::OUString& rsPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener) @@ -572,7 +553,6 @@ void SAL_CALL Theme::removePropertyChangeListener( } } - void SAL_CALL Theme::addVetoableChangeListener( const ::rtl::OUString& rsPropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener) @@ -598,7 +578,6 @@ void SAL_CALL Theme::addVetoableChangeListener( pListeners->push_back(rxListener); } - void SAL_CALL Theme::removeVetoableChangeListener( const ::rtl::OUString& rsPropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener) @@ -633,7 +612,6 @@ void SAL_CALL Theme::removeVetoableChangeListener( } } - css::uno::Sequence<css::beans::Property> SAL_CALL Theme::getProperties (void) throw(css::uno::RuntimeException, std::exception) { @@ -659,7 +637,6 @@ css::uno::Sequence<css::beans::Property> SAL_CALL Theme::getProperties (void) aProperties.size()); } - beans::Property SAL_CALL Theme::getPropertyByName (const ::rtl::OUString& rsPropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) @@ -681,7 +658,6 @@ beans::Property SAL_CALL Theme::getPropertyByName (const ::rtl::OUString& rsProp 0); } - sal_Bool SAL_CALL Theme::hasPropertyByName (const ::rtl::OUString& rsPropertyName) throw(css::uno::RuntimeException, std::exception) { @@ -696,7 +672,6 @@ sal_Bool SAL_CALL Theme::hasPropertyByName (const ::rtl::OUString& rsPropertyNam return sal_True; } - void Theme::SetupPropertyMaps (void) { maPropertyIdToNameMap.resize(__Post_Rect); @@ -772,9 +747,6 @@ void Theme::SetupPropertyMaps (void) maRawValues.resize(maPropertyIdToNameMap.size()); } - - - Theme::PropertyType Theme::GetPropertyType (const ThemeItem eItem) { switch(eItem) @@ -848,7 +820,6 @@ Theme::PropertyType Theme::GetPropertyType (const ThemeItem eItem) } } - css::uno::Type Theme::GetCppuType (const PropertyType eType) { switch(eType) @@ -877,7 +848,6 @@ css::uno::Type Theme::GetCppuType (const PropertyType eType) } } - sal_Int32 Theme::GetIndex (const ThemeItem eItem, const PropertyType eType) { switch(eType) @@ -901,7 +871,6 @@ sal_Int32 Theme::GetIndex (const ThemeItem eItem, const PropertyType eType) } } - Theme::VetoableListenerContainer* Theme::GetVetoableListeners ( const ThemeItem eItem, const bool bCreate) @@ -918,7 +887,6 @@ Theme::VetoableListenerContainer* Theme::GetVetoableListeners ( return NULL; } - Theme::ChangeListenerContainer* Theme::GetChangeListeners ( const ThemeItem eItem, const bool bCreate) @@ -935,7 +903,6 @@ Theme::ChangeListenerContainer* Theme::GetChangeListeners ( return NULL; } - bool Theme::DoVetoableListenersVeto ( const VetoableListenerContainer* pListeners, const beans::PropertyChangeEvent& rEvent) const @@ -966,7 +933,6 @@ bool Theme::DoVetoableListenersVeto ( return false; } - void Theme::BroadcastPropertyChange ( const ChangeListenerContainer* pListeners, const beans::PropertyChangeEvent& rEvent) const @@ -992,7 +958,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 b02bc3f6e783..fa9b8c23a1d7 100644 --- a/sfx2/source/sidebar/TitleBar.cxx +++ b/sfx2/source/sidebar/TitleBar.cxx @@ -28,7 +28,6 @@ #include <com/sun/star/accessibility/AccessibleRole.hpp> - namespace { const static sal_Int32 gnLeftIconSpace (3); @@ -51,26 +50,22 @@ TitleBar::TitleBar ( maToolBox.SetSelectHdl(LINK(this, TitleBar, SelectionHandler)); } - TitleBar::~TitleBar (void) { } - void TitleBar::SetTitle (const ::rtl::OUString& rsTitle) { msTitle = rsTitle; Invalidate(); } - void TitleBar::SetIcon (const Image& rIcon) { maIcon = rIcon; Invalidate(); } - void TitleBar::Paint (const Rectangle& rUpdateArea) { (void)rUpdateArea; @@ -90,7 +85,6 @@ void TitleBar::Paint (const Rectangle& rUpdateArea) PaintFocus(aTitleBox); } - void TitleBar::DataChanged (const DataChangedEvent& rEvent) { (void)rEvent; @@ -98,7 +92,6 @@ void TitleBar::DataChanged (const DataChangedEvent& rEvent) SetBackground(GetBackgroundPaint().GetWallpaper()); } - void TitleBar::setPosSizePixel ( long nX, long nY, @@ -114,21 +107,18 @@ void TitleBar::setPosSizePixel ( maToolBox.Show(); } - void TitleBar::HandleToolBoxItemClick (const sal_uInt16 nItemIndex) { (void)nItemIndex; // Any real processing has to be done in derived class. } - css::uno::Reference<css::accessibility::XAccessible> TitleBar::CreateAccessible (void) { SetAccessibleRole(css::accessibility::AccessibleRole::PANEL); return AccessibleTitleBar::Create(*this); } - void TitleBar::PaintTitle (const Rectangle& rTitleBox) { Push(PushFlags::FONT | PushFlags::TEXTCOLOR); @@ -161,7 +151,6 @@ void TitleBar::PaintTitle (const Rectangle& rTitleBox) Pop(); } - void TitleBar::PaintFocus (const Rectangle& rFocusBox) { Push(PushFlags::FONT | PushFlags::TEXTCOLOR); @@ -189,7 +178,6 @@ void TitleBar::PaintFocus (const Rectangle& rFocusBox) Pop(); } - IMPL_LINK(TitleBar, SelectionHandler, ToolBox*, pToolBox) { (void)pToolBox; diff --git a/sfx2/source/sidebar/TitleBar.hxx b/sfx2/source/sidebar/TitleBar.hxx index ea206c99f90a..cf50dfe74def 100644 --- a/sfx2/source/sidebar/TitleBar.hxx +++ b/sfx2/source/sidebar/TitleBar.hxx @@ -24,7 +24,6 @@ #include <vcl/fixed.hxx> #include <sfx2/sidebar/SidebarToolBox.hxx> - namespace sfx2 { namespace sidebar { class TitleBar @@ -71,7 +70,6 @@ private: DECL_LINK(SelectionHandler, ToolBox*); }; - } } // end of namespace sfx2::sidebar #endif diff --git a/sfx2/source/sidebar/ToolBox.hxx b/sfx2/source/sidebar/ToolBox.hxx index 94e91f7dd505..0742c5cb912d 100644 --- a/sfx2/source/sidebar/ToolBox.hxx +++ b/sfx2/source/sidebar/ToolBox.hxx @@ -21,7 +21,6 @@ #include <vcl/toolbox.hxx> - namespace sfx2 { namespace sidebar { class ToolBox @@ -47,7 +46,6 @@ private: } mePaintType; }; - } } // end of namespace sfx2::sidebar #endif diff --git a/sfx2/source/sidebar/Tools.cxx b/sfx2/source/sidebar/Tools.cxx index 8789546eae17..cb86ea7b079d 100644 --- a/sfx2/source/sidebar/Tools.cxx +++ b/sfx2/source/sidebar/Tools.cxx @@ -36,7 +36,6 @@ using namespace css; using namespace css::uno; - namespace sfx2 { namespace sidebar { Image Tools::GetImage ( @@ -50,7 +49,6 @@ Image Tools::GetImage ( return GetImage(rsImageURL, rxFrame); } - Image Tools::GetImage ( const ::rtl::OUString& rsURL, const Reference<frame::XFrame>& rxFrame) @@ -93,7 +91,6 @@ Image Tools::GetImage ( return Image(); } - css::awt::Gradient Tools::VclToAwtGradient (const Gradient aVclGradient) { css::awt::Gradient aAwtGradient ( @@ -110,7 +107,6 @@ css::awt::Gradient Tools::VclToAwtGradient (const Gradient aVclGradient) return aAwtGradient; } - Gradient Tools::AwtToVclGradient (const css::awt::Gradient aAwtGradient) { Gradient aVclGradient ( @@ -128,7 +124,6 @@ Gradient Tools::AwtToVclGradient (const css::awt::Gradient aAwtGradient) return aVclGradient; } - util::URL Tools::GetURL (const ::rtl::OUString& rsCommand) { util::URL aURL; @@ -141,7 +136,6 @@ util::URL Tools::GetURL (const ::rtl::OUString& rsCommand) return aURL; } - Reference<frame::XDispatch> Tools::GetDispatch ( const css::uno::Reference<css::frame::XFrame>& rxFrame, const util::URL& rURL) @@ -151,7 +145,6 @@ Reference<frame::XDispatch> Tools::GetDispatch ( return xDispatch; } - ::rtl::OUString Tools::GetModuleName ( const css::uno::Reference<css::frame::XFrame>& rxFrame) { @@ -171,7 +164,6 @@ Reference<frame::XDispatch> Tools::GetDispatch ( return ::rtl::OUString(); } - } } // end of namespace sfx2::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |