[Libreoffice-commits] core.git: sd/source sfx2/inc sfx2/source
Stefan Weiberg
stefan.weiberg at germandev.org
Sat Sep 6 13:54:58 PDT 2014
sd/source/ui/framework/module/ResourceManager.cxx | 6 ++--
sfx2/inc/sidebar/ContextChangeBroadcaster.hxx | 9 +++----
sfx2/source/sidebar/Accessible.cxx | 4 +--
sfx2/source/sidebar/Accessible.hxx | 9 +++----
sfx2/source/sidebar/AccessibleTitleBar.cxx | 2 -
sfx2/source/sidebar/AccessibleTitleBar.hxx | 3 --
sfx2/source/sidebar/ContextChangeBroadcaster.cxx | 12 ++++-----
sfx2/source/sidebar/Deck.cxx | 4 +--
sfx2/source/sidebar/DeckLayouter.cxx | 4 +--
sfx2/source/sidebar/DeckTitleBar.hxx | 2 -
sfx2/source/sidebar/MenuButton.cxx | 4 +--
sfx2/source/sidebar/Paint.cxx | 4 +--
sfx2/source/sidebar/Paint.hxx | 3 --
sfx2/source/sidebar/Panel.hxx | 11 ++++----
sfx2/source/sidebar/PanelTitleBar.cxx | 2 -
sfx2/source/sidebar/PanelTitleBar.hxx | 6 ++--
sfx2/source/sidebar/ResourceManager.cxx | 2 -
sfx2/source/sidebar/ResourceManager.hxx | 9 +++----
sfx2/source/sidebar/SidebarController.hxx | 27 ++++++++++------------
sfx2/source/sidebar/SidebarDockingWindow.cxx | 2 -
sfx2/source/sidebar/TabBar.cxx | 4 +--
sfx2/source/sidebar/TabBar.hxx | 5 +---
sfx2/source/sidebar/TabItem.cxx | 4 +--
sfx2/source/sidebar/TitleBar.cxx | 2 -
24 files changed, 66 insertions(+), 74 deletions(-)
New commits:
commit 35354e6ceffc580ef2d9d817e5bbbe1417b63250
Author: Stefan Weiberg <stefan.weiberg at germandev.org>
Date: Wed Sep 3 16:33:13 2014 +0000
Related fdo#82088: removing aliases in headers
Change-Id: Id3496d1720630dd7a873edd04b664fc279c1c25e
Reviewed-on: https://gerrit.libreoffice.org/11294
Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud at gmail.com>
diff --git a/sd/source/ui/framework/module/ResourceManager.cxx b/sd/source/ui/framework/module/ResourceManager.cxx
index e991df0..76c4bbf 100644
--- a/sd/source/ui/framework/module/ResourceManager.cxx
+++ b/sd/source/ui/framework/module/ResourceManager.cxx
@@ -25,9 +25,9 @@
#include <set>
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
+using namespace css;
+using namespace css::uno;
+using namespace css::drawing::framework;
using ::sd::framework::FrameworkHelper;
diff --git a/sfx2/inc/sidebar/ContextChangeBroadcaster.hxx b/sfx2/inc/sidebar/ContextChangeBroadcaster.hxx
index 35484fd..1db0817 100644
--- a/sfx2/inc/sidebar/ContextChangeBroadcaster.hxx
+++ b/sfx2/inc/sidebar/ContextChangeBroadcaster.hxx
@@ -21,7 +21,6 @@
#include <com/sun/star/frame/XFrame.hpp>
-namespace cssu = ::com::sun::star::uno;
namespace sfx2 { namespace sidebar {
@@ -37,8 +36,8 @@ public:
void Initialize (const ::rtl::OUString& rsContextName);
- void Activate (const cssu::Reference<css::frame::XFrame>& rxFrame);
- void Deactivate (const cssu::Reference<css::frame::XFrame>& rxFrame);
+ void Activate (const css::uno::Reference<css::frame::XFrame>& rxFrame);
+ void Deactivate (const css::uno::Reference<css::frame::XFrame>& rxFrame);
/** Enable or disable the broadcaster.
@param bIsEnabled
@@ -53,11 +52,11 @@ private:
bool mbIsBroadcasterEnabled;
void BroadcastContextChange (
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
const ::rtl::OUString& rsModuleName,
const ::rtl::OUString& rsContextName);
::rtl::OUString GetModuleName (
- const cssu::Reference<css::frame::XFrame>& rxFrame);
+ const css::uno::Reference<css::frame::XFrame>& rxFrame);
};
diff --git a/sfx2/source/sidebar/Accessible.cxx b/sfx2/source/sidebar/Accessible.cxx
index 691296e..a365925 100644
--- a/sfx2/source/sidebar/Accessible.cxx
+++ b/sfx2/source/sidebar/Accessible.cxx
@@ -21,7 +21,7 @@
using namespace css;
-using namespace cssu;
+using namespace css::uno;
namespace sfx2 { namespace sidebar {
@@ -55,7 +55,7 @@ void SAL_CALL Accessible::disposing (void)
Reference<accessibility::XAccessibleContext> SAL_CALL Accessible::getAccessibleContext (void)
- throw (cssu::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
return mxContext;
}
diff --git a/sfx2/source/sidebar/Accessible.hxx b/sfx2/source/sidebar/Accessible.hxx
index 92f457e..dfd4506 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 cssu = ::com::sun::star::uno;
namespace
{
@@ -50,18 +49,18 @@ class Accessible
{
public:
Accessible (
- const cssu::Reference<css::accessibility::XAccessibleContext>& rxContext);
+ const css::uno::Reference<css::accessibility::XAccessibleContext>& rxContext);
virtual ~Accessible (void);
virtual void SAL_CALL disposing (void) SAL_OVERRIDE;
// XAccessible
- virtual cssu::Reference<css::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext (void)
- throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference<css::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext (void)
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
- cssu::Reference<css::accessibility::XAccessibleContext> mxContext;
+ css::uno::Reference<css::accessibility::XAccessibleContext> mxContext;
};
diff --git a/sfx2/source/sidebar/AccessibleTitleBar.cxx b/sfx2/source/sidebar/AccessibleTitleBar.cxx
index 22b8c0b..4ce6dea 100644
--- a/sfx2/source/sidebar/AccessibleTitleBar.cxx
+++ b/sfx2/source/sidebar/AccessibleTitleBar.cxx
@@ -25,7 +25,7 @@
#include <unotools/accessiblestatesethelper.hxx>
using namespace css;
-using namespace cssu;
+using namespace css::uno;
namespace sfx2 { namespace sidebar {
diff --git a/sfx2/source/sidebar/AccessibleTitleBar.hxx b/sfx2/source/sidebar/AccessibleTitleBar.hxx
index f8517f8..8415b73 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 cssu = ::com::sun::star::uno;
namespace sfx2 { namespace sidebar {
@@ -32,7 +31,7 @@ class AccessibleTitleBar
: public VCLXAccessibleComponent
{
public:
- static cssu::Reference<css::accessibility::XAccessible> Create (TitleBar& rTitleBar);
+ static css::uno::Reference<css::accessibility::XAccessible> Create (TitleBar& rTitleBar);
protected:
virtual void FillAccessibleStateSet (utl::AccessibleStateSetHelper& rStateSet) SAL_OVERRIDE;
diff --git a/sfx2/source/sidebar/ContextChangeBroadcaster.cxx b/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
index 975fb3e..9cc4c31 100644
--- a/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
+++ b/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
@@ -26,7 +26,7 @@
using ::rtl::OUString;
using namespace css;
-using namespace cssu;
+using namespace css::uno;
namespace sfx2 { namespace sidebar {
@@ -54,7 +54,7 @@ void ContextChangeBroadcaster::Initialize (const ::rtl::OUString& rsContextName)
-void ContextChangeBroadcaster::Activate (const cssu::Reference<css::frame::XFrame>& rxFrame)
+void ContextChangeBroadcaster::Activate (const css::uno::Reference<css::frame::XFrame>& rxFrame)
{
if (msContextName.getLength() > 0)
BroadcastContextChange(rxFrame, GetModuleName(rxFrame), msContextName);
@@ -63,7 +63,7 @@ void ContextChangeBroadcaster::Activate (const cssu::Reference<css::frame::XFram
-void ContextChangeBroadcaster::Deactivate (const cssu::Reference<css::frame::XFrame>& rxFrame)
+void ContextChangeBroadcaster::Deactivate (const css::uno::Reference<css::frame::XFrame>& rxFrame)
{
if (msContextName.getLength() > 0)
{
@@ -88,7 +88,7 @@ bool ContextChangeBroadcaster::SetBroadcasterEnabled (const bool bIsEnabled)
void ContextChangeBroadcaster::BroadcastContextChange (
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
const ::rtl::OUString& rsModuleName,
const ::rtl::OUString& rsContextName)
{
@@ -110,7 +110,7 @@ void ContextChangeBroadcaster::BroadcastContextChange (
rsModuleName,
rsContextName);
- cssu::Reference<css::ui::XContextChangeEventMultiplexer> xMultiplexer (
+ css::uno::Reference<css::ui::XContextChangeEventMultiplexer> xMultiplexer (
css::ui::ContextChangeEventMultiplexer::get(
::comphelper::getProcessComponentContext()));
if (xMultiplexer.is())
@@ -120,7 +120,7 @@ void ContextChangeBroadcaster::BroadcastContextChange (
-OUString ContextChangeBroadcaster::GetModuleName (const cssu::Reference<css::frame::XFrame>& rxFrame)
+OUString ContextChangeBroadcaster::GetModuleName (const css::uno::Reference<css::frame::XFrame>& rxFrame)
{
if ( ! rxFrame.is() || ! rxFrame->getController().is())
return OUString();
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 0be4a46..63e24db 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -34,8 +34,8 @@
#include <boost/bind.hpp>
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
+using namespace css;
+using namespace css::uno;
namespace sfx2 { namespace sidebar {
diff --git a/sfx2/source/sidebar/DeckLayouter.cxx b/sfx2/source/sidebar/DeckLayouter.cxx
index c87625b..c4a4259 100644
--- a/sfx2/source/sidebar/DeckLayouter.cxx
+++ b/sfx2/source/sidebar/DeckLayouter.cxx
@@ -26,8 +26,8 @@
#include <vcl/window.hxx>
#include <vcl/scrbar.hxx>
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
+using namespace css;
+using namespace css::uno;
namespace sfx2 { namespace sidebar {
diff --git a/sfx2/source/sidebar/DeckTitleBar.hxx b/sfx2/source/sidebar/DeckTitleBar.hxx
index d70e148..dae392f 100644
--- a/sfx2/source/sidebar/DeckTitleBar.hxx
+++ b/sfx2/source/sidebar/DeckTitleBar.hxx
@@ -46,7 +46,7 @@ protected:
virtual sidebar::Paint GetBackgroundPaint (void) SAL_OVERRIDE;
virtual Color GetTextColor (void) SAL_OVERRIDE;
virtual void HandleToolBoxItemClick (const sal_uInt16 nItemIndex) SAL_OVERRIDE;
- virtual cssu::Reference<css::accessibility::XAccessible> CreateAccessible (void) SAL_OVERRIDE;
+ virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible (void) SAL_OVERRIDE;
private:
const sal_uInt16 mnCloserItemIndex;
diff --git a/sfx2/source/sidebar/MenuButton.cxx b/sfx2/source/sidebar/MenuButton.cxx
index 5afb532..f2e9a43 100644
--- a/sfx2/source/sidebar/MenuButton.cxx
+++ b/sfx2/source/sidebar/MenuButton.cxx
@@ -24,8 +24,8 @@
#include <sfx2/sidebar/Tools.hxx>
#include <sfx2/sidebar/Theme.hxx>
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
+using namespace css;
+using namespace css::uno;
namespace sfx2 { namespace sidebar {
diff --git a/sfx2/source/sidebar/Paint.cxx b/sfx2/source/sidebar/Paint.cxx
index 0faecdb..ea99762 100644
--- a/sfx2/source/sidebar/Paint.cxx
+++ b/sfx2/source/sidebar/Paint.cxx
@@ -21,7 +21,7 @@
#include <com/sun/star/awt/Gradient.hpp>
-using namespace ::com::sun::star;
+using namespace css;
namespace sfx2 { namespace sidebar {
@@ -51,7 +51,7 @@ Paint::Paint (const Gradient& rGradient)
-Paint Paint::Create (const cssu::Any& rValue)
+Paint Paint::Create (const css::uno::Any& rValue)
{
ColorData aColor (0);
if (rValue >>= aColor)
diff --git a/sfx2/source/sidebar/Paint.hxx b/sfx2/source/sidebar/Paint.hxx
index eaa69e1..df381df 100644
--- a/sfx2/source/sidebar/Paint.hxx
+++ b/sfx2/source/sidebar/Paint.hxx
@@ -26,7 +26,6 @@
#include <boost/variant.hpp>
-namespace cssu = ::com::sun::star::uno;
namespace sfx2 { namespace sidebar {
@@ -48,7 +47,7 @@ public:
// Create a Paint object for an Any that may contain a color, a
// awt::Gradient, or nothing.
- static Paint Create (const cssu::Any& rValue);
+ static Paint Create (const css::uno::Any& rValue);
// Create paint with type NoPaint.
explicit Paint (void);
diff --git a/sfx2/source/sidebar/Panel.hxx b/sfx2/source/sidebar/Panel.hxx
index ee64df3..7196a77 100644
--- a/sfx2/source/sidebar/Panel.hxx
+++ b/sfx2/source/sidebar/Panel.hxx
@@ -30,7 +30,6 @@
#include <boost/shared_ptr.hpp>
#include <vector>
-namespace cssu = ::com::sun::star::uno;
namespace sfx2 { namespace sidebar {
@@ -55,9 +54,9 @@ public:
PanelTitleBar* GetTitleBar (void) const;
bool IsTitleBarOptional (void) const { return mbIsTitleBarOptional;}
- void SetUIElement (const cssu::Reference<css::ui::XUIElement>& rxElement);
- cssu::Reference<css::ui::XSidebarPanel> GetPanelComponent (void) const { return mxPanelComponent;}
- cssu::Reference<css::awt::XWindow> GetElementWindow (void);
+ void SetUIElement (const css::uno::Reference<css::ui::XUIElement>& rxElement);
+ css::uno::Reference<css::ui::XSidebarPanel> GetPanelComponent (void) const { return mxPanelComponent;}
+ css::uno::Reference<css::awt::XWindow> GetElementWindow (void);
void SetExpanded (const bool bIsExpanded);
bool IsExpanded (void) const { return mbIsExpanded;}
bool HasIdPredicate (const ::rtl::OUString& rsId) const;
@@ -72,8 +71,8 @@ private:
const ::rtl::OUString msPanelId;
::boost::scoped_ptr<PanelTitleBar> mpTitleBar;
const bool mbIsTitleBarOptional;
- cssu::Reference<css::ui::XUIElement> mxElement;
- cssu::Reference<css::ui::XSidebarPanel> mxPanelComponent;
+ css::uno::Reference<css::ui::XUIElement> mxElement;
+ css::uno::Reference<css::ui::XSidebarPanel> mxPanelComponent;
bool mbIsExpanded;
const ::boost::function<void(void)> maDeckLayoutTrigger;
const ::boost::function<Context(void)> maContextAccess;
diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx b/sfx2/source/sidebar/PanelTitleBar.cxx
index 151d423..5f722cb 100644
--- a/sfx2/source/sidebar/PanelTitleBar.cxx
+++ b/sfx2/source/sidebar/PanelTitleBar.cxx
@@ -72,7 +72,7 @@ PanelTitleBar::~PanelTitleBar (void)
void PanelTitleBar::SetMoreOptionsCommand (
const ::rtl::OUString& rsCommandName,
- const ::cssu::Reference<css::frame::XFrame>& rxFrame)
+ const css::uno::Reference<css::frame::XFrame>& rxFrame)
{
if ( ! rsCommandName.equals(msMoreOptionsCommand))
{
diff --git a/sfx2/source/sidebar/PanelTitleBar.hxx b/sfx2/source/sidebar/PanelTitleBar.hxx
index 4d4a27f..2e2adbb 100644
--- a/sfx2/source/sidebar/PanelTitleBar.hxx
+++ b/sfx2/source/sidebar/PanelTitleBar.hxx
@@ -41,7 +41,7 @@ public:
void SetMoreOptionsCommand (
const ::rtl::OUString& rsCommandName,
- const ::cssu::Reference<css::frame::XFrame>& rxFrame);
+ const css::uno::Reference<css::frame::XFrame>& rxFrame);
virtual void DataChanged (const DataChangedEvent& rEvent) SAL_OVERRIDE;
virtual void MouseButtonDown (const MouseEvent& rMouseEvent) SAL_OVERRIDE;
@@ -53,13 +53,13 @@ protected:
virtual sidebar::Paint GetBackgroundPaint (void) SAL_OVERRIDE;
virtual Color GetTextColor (void) SAL_OVERRIDE;
virtual void HandleToolBoxItemClick (const sal_uInt16 nItemIndex) SAL_OVERRIDE;
- virtual cssu::Reference<css::accessibility::XAccessible> CreateAccessible (void) SAL_OVERRIDE;
+ virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible (void) SAL_OVERRIDE;
private:
bool mbIsLeftButtonDown;
Panel* mpPanel;
const sal_uInt16 mnMenuItemIndex;
- cssu::Reference<css::frame::XFrame> mxFrame;
+ css::uno::Reference<css::frame::XFrame> mxFrame;
::rtl::OUString msMoreOptionsCommand;
::rtl::OUString msAccessibleNamePrefix;
};
diff --git a/sfx2/source/sidebar/ResourceManager.cxx b/sfx2/source/sidebar/ResourceManager.cxx
index 53fa381..1b4971f 100644
--- a/sfx2/source/sidebar/ResourceManager.cxx
+++ b/sfx2/source/sidebar/ResourceManager.cxx
@@ -34,7 +34,7 @@
using ::rtl::OUString;
using namespace css;
-using namespace cssu;
+using namespace css::uno;
namespace sfx2 { namespace sidebar {
diff --git a/sfx2/source/sidebar/ResourceManager.hxx b/sfx2/source/sidebar/ResourceManager.hxx
index 7ce2a02..cd199f1 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 cssu = ::com::sun::star::uno;
namespace sfx2 { namespace sidebar {
@@ -81,13 +80,13 @@ public:
DeckContextDescriptorContainer& rDeckDescriptors,
const Context& rContext,
const bool bIsDocumentReadOnly,
- const cssu::Reference<css::frame::XFrame>& rxFrame);
+ const css::uno::Reference<css::frame::XFrame>& rxFrame);
const PanelContextDescriptorContainer& GetMatchingPanels (
PanelContextDescriptorContainer& rPanelDescriptors,
const Context& rContext,
const ::rtl::OUString& rsDeckId,
- const cssu::Reference<css::frame::XFrame>& rxFrame);
+ const css::uno::Reference<css::frame::XFrame>& rxFrame);
/** Remember the expansions state per panel and context.
This is not persistent past application end.
@@ -114,7 +113,7 @@ private:
ContextList& rContextList,
const ::rtl::OUString& rsDefaultMenuCommand) const;
void ReadLegacyAddons (
- const cssu::Reference<css::frame::XFrame>& rxFrame);
+ const css::uno::Reference<css::frame::XFrame>& rxFrame);
::utl::OConfigurationTreeRoot GetLegacyAddonRootNode (
const ::rtl::OUString& rsModuleName) const;
void GetToolPanelNodeNames (
@@ -123,7 +122,7 @@ private:
bool IsDeckEnabled (
const ::rtl::OUString& rsDeckId,
const Context& rContext,
- const cssu::Reference<css::frame::XFrame>& rxFrame) const;
+ const css::uno::Reference<css::frame::XFrame>& rxFrame) const;
};
diff --git a/sfx2/source/sidebar/SidebarController.hxx b/sfx2/source/sidebar/SidebarController.hxx
index 4043bb5..31306b2 100644
--- a/sfx2/source/sidebar/SidebarController.hxx
+++ b/sfx2/source/sidebar/SidebarController.hxx
@@ -45,7 +45,6 @@
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/weakref.hxx>
-namespace cssu = ::com::sun::star::uno;
namespace
@@ -78,7 +77,7 @@ class SidebarController
public:
SidebarController(
SidebarDockingWindow* pParentWindow,
- const cssu::Reference<css::frame::XFrame>& rxFrame);
+ const css::uno::Reference<css::frame::XFrame>& rxFrame);
virtual ~SidebarController (void);
/** Return the SidebarController object that is associated with
@@ -88,27 +87,27 @@ public:
XFrame then <NULL/> is returned.
*/
static SidebarController* GetSidebarControllerForFrame (
- const cssu::Reference<css::frame::XFrame>& rxFrame);
+ const css::uno::Reference<css::frame::XFrame>& rxFrame);
// ui::XContextChangeEventListener
virtual void SAL_CALL notifyContextChangeEvent (const css::ui::ContextChangeEventObject& rEvent)
- throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XEventListener
virtual void SAL_CALL disposing (const css::lang::EventObject& rEventObject)
- throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// beans::XPropertyChangeListener
virtual void SAL_CALL propertyChange (const css::beans::PropertyChangeEvent& rEvent)
- throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// frame::XStatusListener
virtual void SAL_CALL statusChanged (const css::frame::FeatureStateEvent& rEvent)
- throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ui::XSidebar
virtual void SAL_CALL requestLayout (void)
- throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
void NotifyResize (void);
@@ -138,15 +137,15 @@ public:
private:
typedef ::std::map<
- const cssu::Reference<css::frame::XFrame>,
- cssu::WeakReference<SidebarController>
+ const css::uno::Reference<css::frame::XFrame>,
+ css::uno::WeakReference<SidebarController>
> SidebarControllerContainer;
static SidebarControllerContainer maSidebarControllerContainer;
::boost::scoped_ptr<Deck> mpCurrentDeck;
SidebarDockingWindow* mpParentWindow;
::boost::scoped_ptr<TabBar> mpTabBar;
- cssu::Reference<css::frame::XFrame> mxFrame;
+ css::uno::Reference<css::frame::XFrame> mxFrame;
Context maCurrentContext;
Context maRequestedContext;
/// Use a combination of SwitchFlag_* as value.
@@ -174,7 +173,7 @@ private:
*/
sal_Int32 mnSavedSidebarWidth;
FocusManager maFocusManager;
- cssu::Reference<css::frame::XDispatch> mxReadOnlyModeDispatch;
+ css::uno::Reference<css::frame::XDispatch> mxReadOnlyModeDispatch;
bool mbIsDocumentReadOnly;
SfxSplitWindow* mpSplitWindow;
/** When the user moves the splitter then we remember the
@@ -192,8 +191,8 @@ private:
*/
void UpdateConfigurations (void);
- cssu::Reference<css::ui::XUIElement> CreateUIElement (
- const cssu::Reference<css::awt::XWindowPeer>& rxWindow,
+ css::uno::Reference<css::ui::XUIElement> CreateUIElement (
+ const css::uno::Reference<css::awt::XWindowPeer>& rxWindow,
const ::rtl::OUString& rsImplementationURL,
const bool bWantsCanvas,
const Context& rContext);
diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx b/sfx2/source/sidebar/SidebarDockingWindow.cxx
index 9c0d52e..d6c91db 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.cxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx
@@ -25,7 +25,7 @@
#include <tools/link.hxx>
using namespace css;
-using namespace cssu;
+using namespace css::uno;
namespace sfx2 { namespace sidebar {
diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index 8587bcb..c64f0ea 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -35,8 +35,8 @@
#include <com/sun/star/graphic/XGraphicProvider.hpp>
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
+using namespace css;
+using namespace css::uno;
diff --git a/sfx2/source/sidebar/TabBar.hxx b/sfx2/source/sidebar/TabBar.hxx
index e037533..ffef772 100644
--- a/sfx2/source/sidebar/TabBar.hxx
+++ b/sfx2/source/sidebar/TabBar.hxx
@@ -34,7 +34,6 @@ class Button;
class CheckBox;
class RadioButton;
-namespace cssu = ::com::sun::star::uno;
namespace sfx2 { namespace sidebar {
@@ -67,7 +66,7 @@ public:
const ::std::vector<DeckMenuData>& rMenuData)> PopupMenuProvider;
TabBar (
Window* pParentWindow,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
const ::boost::function<void(const ::rtl::OUString&rsDeckId)>& rDeckActivationFunctor,
const PopupMenuProvider& rPopupMenuProvider);
virtual ~TabBar (void);
@@ -95,7 +94,7 @@ public:
void UpdateFocusManager (FocusManager& rFocusManager);
private:
- cssu::Reference<css::frame::XFrame> mxFrame;
+ css::uno::Reference<css::frame::XFrame> mxFrame;
::boost::scoped_ptr<CheckBox> mpMenuButton;
class Item
{
diff --git a/sfx2/source/sidebar/TabItem.cxx b/sfx2/source/sidebar/TabItem.cxx
index e4d43c0..1d5bc99 100644
--- a/sfx2/source/sidebar/TabItem.cxx
+++ b/sfx2/source/sidebar/TabItem.cxx
@@ -25,8 +25,8 @@
#include <sfx2/sidebar/Theme.hxx>
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
+using namespace css;
+using namespace css::uno;
namespace sfx2 { namespace sidebar {
diff --git a/sfx2/source/sidebar/TitleBar.cxx b/sfx2/source/sidebar/TitleBar.cxx
index 80e4c18..f6c2e0f 100644
--- a/sfx2/source/sidebar/TitleBar.cxx
+++ b/sfx2/source/sidebar/TitleBar.cxx
@@ -146,7 +146,7 @@ void TitleBar::HandleToolBoxItemClick (const sal_uInt16 nItemIndex)
-cssu::Reference<css::accessibility::XAccessible> TitleBar::CreateAccessible (void)
+css::uno::Reference<css::accessibility::XAccessible> TitleBar::CreateAccessible (void)
{
SetAccessibleRole(css::accessibility::AccessibleRole::PANEL);
return AccessibleTitleBar::Create(*this);
More information about the Libreoffice-commits
mailing list