[Libreoffice-commits] core.git: include/sfx2 sc/source sd/source sfx2/source svx/source sw/source
Stefan Weiberg
stefan.weiberg at germandev.org
Wed Sep 3 00:04:03 PDT 2014
include/sfx2/sidebar/CommandInfoProvider.hxx | 27 +++++-----
include/sfx2/sidebar/ControllerFactory.hxx | 11 +---
include/sfx2/sidebar/ControllerItem.hxx | 7 +-
include/sfx2/sidebar/Sidebar.hxx | 4 -
include/sfx2/sidebar/SidebarPanelBase.hxx | 42 +++++++---------
include/sfx2/sidebar/SidebarToolBox.hxx | 9 +--
include/sfx2/sidebar/Theme.hxx | 48 +++++++++----------
sc/source/ui/sidebar/AlignmentPropertyPanel.cxx | 6 +-
sc/source/ui/sidebar/AlignmentPropertyPanel.hxx | 6 +-
sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx | 6 +-
sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx | 6 +-
sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx | 6 +-
sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx | 6 +-
sc/source/ui/sidebar/ScPanelFactory.cxx | 12 ++--
sd/source/ui/animations/CustomAnimationPane.cxx | 4 -
sd/source/ui/animations/CustomAnimationPane.hxx | 2
sd/source/ui/animations/SlideTransitionPane.cxx | 4 -
sd/source/ui/animations/SlideTransitionPane.hxx | 2
sd/source/ui/inc/createcustomanimationpanel.hxx | 2
sd/source/ui/inc/createslidetransitionpanel.hxx | 2
sd/source/ui/sidebar/LayoutMenu.cxx | 2
sd/source/ui/sidebar/MasterPagesSelector.cxx | 2
sd/source/ui/sidebar/PanelFactory.cxx | 4 -
sfx2/source/sidebar/CommandInfoProvider.cxx | 5 -
sfx2/source/sidebar/ControllerFactory.cxx | 2
sfx2/source/sidebar/ControllerItem.cxx | 6 +-
sfx2/source/sidebar/DeckTitleBar.cxx | 2
sfx2/source/sidebar/Panel.cxx | 3 -
sfx2/source/sidebar/PanelTitleBar.cxx | 2
sfx2/source/sidebar/Sidebar.cxx | 3 -
sfx2/source/sidebar/SidebarController.cxx | 22 ++++----
sfx2/source/sidebar/SidebarPanelBase.cxx | 34 ++++++-------
sfx2/source/sidebar/SidebarToolBox.cxx | 8 +--
sfx2/source/sidebar/Theme.cxx | 36 +++++++-------
sfx2/source/sidebar/TitleBar.hxx | 2
sfx2/source/sidebar/Tools.cxx | 6 +-
svx/source/sidebar/area/AreaPropertyPanel.cxx | 6 +-
svx/source/sidebar/area/AreaPropertyPanel.hxx | 6 +-
svx/source/sidebar/graphic/GraphicPropertyPanel.cxx | 6 +-
svx/source/sidebar/graphic/GraphicPropertyPanel.hxx | 6 +-
svx/source/sidebar/insert/InsertPropertyPanel.cxx | 4 -
svx/source/sidebar/line/LinePropertyPanel.cxx | 6 +-
svx/source/sidebar/line/LinePropertyPanel.hxx | 6 +-
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 10 +--
svx/source/sidebar/paragraph/ParaPropertyPanel.hxx | 14 ++---
svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 10 +--
svx/source/sidebar/possize/PosSizePropertyPanel.hxx | 12 ++--
svx/source/sidebar/text/TextPropertyPanel.cxx | 6 +-
svx/source/sidebar/text/TextPropertyPanel.hxx | 4 -
sw/source/uibase/sidebar/PagePropertyPanel.cxx | 12 ++--
sw/source/uibase/sidebar/PagePropertyPanel.hxx | 3 -
sw/source/uibase/sidebar/SwPanelFactory.cxx | 8 +--
52 files changed, 227 insertions(+), 243 deletions(-)
New commits:
commit 9fba10b5a5f1e56dde0cdc4859622fb40db1c13a
Author: Stefan Weiberg <stefan.weiberg at germandev.org>
Date: Tue Sep 2 17:38:00 2014 +0000
Related fdo#82088: removing another bunch of alias
Change-Id: I6e2ab6d20723803aedb530b4d25aa79ec0edbb8f
Reviewed-on: https://gerrit.libreoffice.org/11260
Reviewed-by: Thomas Arnhold <thomas at arnhold.org>
Tested-by: Thomas Arnhold <thomas at arnhold.org>
diff --git a/include/sfx2/sidebar/CommandInfoProvider.hxx b/include/sfx2/sidebar/CommandInfoProvider.hxx
index bd95ce1..6eb1ba6 100644
--- a/include/sfx2/sidebar/CommandInfoProvider.hxx
+++ b/include/sfx2/sidebar/CommandInfoProvider.hxx
@@ -25,7 +25,6 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/ui/XAcceleratorConfiguration.hpp>
-namespace cssu = ::com::sun::star::uno;
namespace sfx2 { namespace sidebar {
@@ -57,34 +56,34 @@ public:
*/
::rtl::OUString GetLabelForCommand (
const ::rtl::OUString& rsCommandName,
- const cssu::Reference<css::frame::XFrame>& rxFrame);
+ const css::uno::Reference<css::frame::XFrame>& rxFrame);
/** Do not call. Should be part of a local and hidden interface.
*/
- void SetFrame (const cssu::Reference<css::frame::XFrame>& rxFrame);
+ void SetFrame (const css::uno::Reference<css::frame::XFrame>& rxFrame);
private:
- cssu::Reference<css::uno::XComponentContext> mxContext;
- cssu::Reference<css::frame::XFrame> mxCachedDataFrame;
- cssu::Reference<css::ui::XAcceleratorConfiguration> mxCachedDocumentAcceleratorConfiguration;
- cssu::Reference<css::ui::XAcceleratorConfiguration> mxCachedModuleAcceleratorConfiguration;
- cssu::Reference<css::ui::XAcceleratorConfiguration> mxCachedGlobalAcceleratorConfiguration;
+ css::uno::Reference<css::uno::XComponentContext> mxContext;
+ css::uno::Reference<css::frame::XFrame> mxCachedDataFrame;
+ css::uno::Reference<css::ui::XAcceleratorConfiguration> mxCachedDocumentAcceleratorConfiguration;
+ css::uno::Reference<css::ui::XAcceleratorConfiguration> mxCachedModuleAcceleratorConfiguration;
+ css::uno::Reference<css::ui::XAcceleratorConfiguration> mxCachedGlobalAcceleratorConfiguration;
::rtl::OUString msCachedModuleIdentifier;
- cssu::Reference<css::lang::XComponent> mxFrameListener;
+ css::uno::Reference<css::lang::XComponent> mxFrameListener;
CommandInfoProvider (void);
~CommandInfoProvider (void);
- cssu::Reference<css::ui::XAcceleratorConfiguration> GetDocumentAcceleratorConfiguration (void);
- cssu::Reference<css::ui::XAcceleratorConfiguration> GetModuleAcceleratorConfiguration (void);
- cssu::Reference<css::ui::XAcceleratorConfiguration> GetGlobalAcceleratorConfiguration(void);
+ css::uno::Reference<css::ui::XAcceleratorConfiguration> GetDocumentAcceleratorConfiguration (void);
+ css::uno::Reference<css::ui::XAcceleratorConfiguration> GetModuleAcceleratorConfiguration (void);
+ css::uno::Reference<css::ui::XAcceleratorConfiguration> GetGlobalAcceleratorConfiguration(void);
::rtl::OUString GetModuleIdentifier (void);
::rtl::OUString GetCommandShortcut (const ::rtl::OUString& rCommandName);
- cssu::Sequence<css::beans::PropertyValue> GetCommandProperties (
+ css::uno::Sequence<css::beans::PropertyValue> GetCommandProperties (
const ::rtl::OUString& rsCommandName);
::rtl::OUString GetCommandLabel (const ::rtl::OUString& rsCommandName);
rtl::OUString RetrieveShortcutsFromConfiguration(
- const cssu::Reference<css::ui::XAcceleratorConfiguration>& rxConfiguration,
+ const css::uno::Reference<css::ui::XAcceleratorConfiguration>& rxConfiguration,
const rtl::OUString& rsCommandName);
};
diff --git a/include/sfx2/sidebar/ControllerFactory.hxx b/include/sfx2/sidebar/ControllerFactory.hxx
index 16ba115..985ee9b 100644
--- a/include/sfx2/sidebar/ControllerFactory.hxx
+++ b/include/sfx2/sidebar/ControllerFactory.hxx
@@ -24,7 +24,6 @@
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/frame/XToolbarController.hpp>
-namespace cssu = ::com::sun::star::uno;
class ToolBox;
@@ -35,19 +34,19 @@ namespace sfx2 { namespace sidebar {
class SFX2_DLLPUBLIC ControllerFactory
{
public:
- static cssu::Reference<css::frame::XToolbarController> CreateToolBoxController(
+ static css::uno::Reference<css::frame::XToolbarController> CreateToolBoxController(
ToolBox* pToolBox,
const sal_uInt16 nItemId,
const ::rtl::OUString& rsCommandName,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
- const cssu::Reference<css::awt::XWindow>& rxParentWindow,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::awt::XWindow>& rxParentWindow,
const sal_Int32 nItemWidth);
private:
- static cssu::Reference<css::frame::XToolbarController> CreateToolBarController(
+ static css::uno::Reference<css::frame::XToolbarController> CreateToolBarController(
ToolBox* pToolBox,
const ::rtl::OUString& rsCommandName,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
const sal_Int32 nWidth);
};
diff --git a/include/sfx2/sidebar/ControllerItem.hxx b/include/sfx2/sidebar/ControllerItem.hxx
index 40ea6da..4f58acf 100644
--- a/include/sfx2/sidebar/ControllerItem.hxx
+++ b/include/sfx2/sidebar/ControllerItem.hxx
@@ -30,7 +30,6 @@
#include <boost/function.hpp>
-namespace cssu = ::com::sun::star::uno;
class SfxViewFrame;
class ToolBox;
@@ -70,7 +69,7 @@ public:
SfxBindings &rBindings,
ItemUpdateReceiverInterface& rItemUpdateReceiver,
const ::rtl::OUString& rsCommandName,
- const cssu::Reference<css::frame::XFrame>& rxFrame);
+ const css::uno::Reference<css::frame::XFrame>& rxFrame);
/** This is the simpler constructor variant that still exists for
compatibility resons. Note that GetLabel() and GetIcon() will
@@ -129,8 +128,8 @@ protected:
private:
ItemUpdateReceiverInterface& mrItemUpdateReceiver;
- cssu::Reference<css::frame::XFrame> mxFrame;
- cssu::Reference<css::lang::XComponent> mxFrameActionListener;
+ css::uno::Reference<css::frame::XFrame> mxFrame;
+ css::uno::Reference<css::lang::XComponent> mxFrameActionListener;
const ::rtl::OUString msCommandName;
void SetupCommandURL (const sal_Char* sCommandName);
diff --git a/include/sfx2/sidebar/Sidebar.hxx b/include/sfx2/sidebar/Sidebar.hxx
index 45c47d0..aea1fcb 100644
--- a/include/sfx2/sidebar/Sidebar.hxx
+++ b/include/sfx2/sidebar/Sidebar.hxx
@@ -23,8 +23,6 @@
#include <sfx2/dllapi.h>
#include <com/sun/star/frame/XFrame.hpp>
-namespace cssu = ::com::sun::star::uno;
-
namespace sfx2 { namespace sidebar {
@@ -41,7 +39,7 @@ public:
*/
static void ShowPanel (
const ::rtl::OUString& rsPanelId,
- const cssu::Reference<css::frame::XFrame>& rxFrame);
+ const css::uno::Reference<css::frame::XFrame>& rxFrame);
};
} } // end of namespace sfx2::sidebar
diff --git a/include/sfx2/sidebar/SidebarPanelBase.hxx b/include/sfx2/sidebar/SidebarPanelBase.hxx
index eded1b3..537c085 100644
--- a/include/sfx2/sidebar/SidebarPanelBase.hxx
+++ b/include/sfx2/sidebar/SidebarPanelBase.hxx
@@ -34,8 +34,6 @@
#include <boost/noncopyable.hpp>
#include <boost/function.hpp>
-namespace cssu = ::com::sun::star::uno;
-
class Window;
@@ -60,57 +58,57 @@ class SFX2_DLLPUBLIC SidebarPanelBase
public SidebarPanelBaseInterfaceBase
{
public:
- static cssu::Reference<css::ui::XUIElement> Create (
+ static css::uno::Reference<css::ui::XUIElement> Create (
const ::rtl::OUString& rsResourceURL,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
Window* pControl,
const css::ui::LayoutSize& rLayoutSize);
// 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& rEvent)
- throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XUIElement
- virtual cssu::Reference<css::frame::XFrame> SAL_CALL getFrame (void)
- throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference<css::frame::XFrame> SAL_CALL getFrame (void)
+ throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::rtl::OUString SAL_CALL getResourceURL (void)
- throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Int16 SAL_CALL getType (void)
- throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual cssu::Reference<cssu::XInterface> SAL_CALL getRealInterface (void)
- throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getRealInterface (void)
+ throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XToolPanel
- virtual cssu::Reference<css::accessibility::XAccessible> SAL_CALL createAccessible (
- const cssu::Reference<css::accessibility::XAccessible>& rxParentAccessible)
- throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual cssu::Reference<css::awt::XWindow> SAL_CALL getWindow (void)
- throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL createAccessible (
+ const css::uno::Reference<css::accessibility::XAccessible>& rxParentAccessible)
+ throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference<css::awt::XWindow> SAL_CALL getWindow (void)
+ throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XSidebarPanel
virtual css::ui::LayoutSize SAL_CALL getHeightForWidth (sal_Int32 nWidth)
- throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getMinimalWidth ()
- throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
protected:
- cssu::Reference<css::frame::XFrame> mxFrame;
+ css::uno::Reference<css::frame::XFrame> mxFrame;
SidebarPanelBase (
const ::rtl::OUString& rsResourceURL,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
Window* pWindow,
const css::ui::LayoutSize& rLayoutSize);
virtual ~SidebarPanelBase (void);
virtual void SAL_CALL disposing (void)
- throw (cssu::RuntimeException) SAL_OVERRIDE;
+ throw (css::uno::RuntimeException) SAL_OVERRIDE;
private:
Window* mpControl;
diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx
index aa712c6..8bcc6be 100644
--- a/include/sfx2/sidebar/SidebarToolBox.hxx
+++ b/include/sfx2/sidebar/SidebarToolBox.hxx
@@ -27,7 +27,6 @@
#include <com/sun/star/util/URL.hpp>
#include <map>
-namespace cssu = ::com::sun::star::uno;
namespace sfx2 { namespace sidebar {
@@ -54,14 +53,14 @@ public:
virtual bool Notify (NotifyEvent& rEvent) SAL_OVERRIDE;
- cssu::Reference<css::frame::XToolbarController> GetControllerForItemId (
+ css::uno::Reference<css::frame::XToolbarController> GetControllerForItemId (
const sal_uInt16 nItemId) const;
sal_uInt16 GetItemIdForSubToolbarName (
const ::rtl::OUString& rsCOmmandName) const;
void SetController (
const sal_uInt16 nItemId,
- const cssu::Reference<css::frame::XToolbarController>& rxController,
+ const css::uno::Reference<css::frame::XToolbarController>& rxController,
const ::rtl::OUString& rsCommandName);
private:
@@ -69,7 +68,7 @@ private:
class ItemDescriptor
{
public:
- cssu::Reference<css::frame::XToolbarController> mxController;
+ css::uno::Reference<css::frame::XToolbarController> mxController;
css::util::URL maURL;
rtl::OUString msCurrentCommand;
};
@@ -86,7 +85,7 @@ private:
void CreateController (
const sal_uInt16 nItemId,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
const sal_Int32 nItemWidth = 0);
void RegisterHandlers (void);
};
diff --git a/include/sfx2/sidebar/Theme.hxx b/include/sfx2/sidebar/Theme.hxx
index 8d1a991..4123a78 100644
--- a/include/sfx2/sidebar/Theme.hxx
+++ b/include/sfx2/sidebar/Theme.hxx
@@ -37,8 +37,6 @@
class SvBorder;
-namespace cssu = ::com::sun::star::uno;
-
namespace sfx2 { namespace sidebar {
@@ -159,55 +157,55 @@ public:
virtual void SAL_CALL disposing (void) SAL_OVERRIDE;
- static cssu::Reference<css::beans::XPropertySet> GetPropertySet (void);
+ static css::uno::Reference<css::beans::XPropertySet> GetPropertySet (void);
// beans::XPropertySet
- virtual cssu::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo (void)
- throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo (void)
+ throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setPropertyValue (
const ::rtl::OUString& rsPropertyName,
- const cssu::Any& rValue)
+ const css::uno::Any& rValue)
throw (css::beans::UnknownPropertyException,
css::uno::RuntimeException,
std::exception) SAL_OVERRIDE;
- virtual cssu::Any SAL_CALL getPropertyValue (
+ virtual css::uno::Any SAL_CALL getPropertyValue (
const ::rtl::OUString& rsPropertyName)
throw(css::beans::UnknownPropertyException,
css::lang::WrappedTargetException,
- cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addPropertyChangeListener(
const ::rtl::OUString& rsPropertyName,
- const cssu::Reference<css::beans::XPropertyChangeListener>& rxListener)
+ const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener)
throw(css::beans::UnknownPropertyException,
css::lang::WrappedTargetException,
- cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removePropertyChangeListener(
const ::rtl::OUString& rsPropertyName,
- const cssu::Reference<css::beans::XPropertyChangeListener>& rxListener)
+ const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener)
throw(css::beans::UnknownPropertyException,
css::lang::WrappedTargetException,
- cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addVetoableChangeListener(
const ::rtl::OUString& rsPropertyName,
- const cssu::Reference<css::beans::XVetoableChangeListener>& rxListener)
+ const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener)
throw(css::beans::UnknownPropertyException,
css::lang::WrappedTargetException,
- cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeVetoableChangeListener(
const ::rtl::OUString& rsPropertyName,
- const cssu::Reference<css::beans::XVetoableChangeListener>& rxListener)
+ const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener)
throw(css::beans::UnknownPropertyException,
css::lang::WrappedTargetException,
- cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// beans::XPropertySetInfo
- virtual cssu::Sequence<css::beans::Property> SAL_CALL getProperties (void)
- throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence<css::beans::Property> SAL_CALL getProperties (void)
+ throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual css::beans::Property SAL_CALL getPropertyByName (const ::rtl::OUString& rsName)
throw(css::beans::UnknownPropertyException,
- cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL hasPropertyByName (const ::rtl::OUString& rsName)
- throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
static Theme& GetCurrentTheme();
@@ -225,13 +223,13 @@ private:
PropertyNameToIdMap maPropertyNameToIdMap;
typedef ::std::vector<rtl::OUString> PropertyIdToNameMap;
PropertyIdToNameMap maPropertyIdToNameMap;
- typedef ::std::vector<cssu::Any> RawValueContainer;
+ typedef ::std::vector<css::uno::Any> RawValueContainer;
RawValueContainer maRawValues;
- typedef ::std::vector<cssu::Reference<css::beans::XPropertyChangeListener> > ChangeListenerContainer;
+ typedef ::std::vector<css::uno::Reference<css::beans::XPropertyChangeListener> > ChangeListenerContainer;
typedef ::std::map<ThemeItem,ChangeListenerContainer> ChangeListeners;
ChangeListeners maChangeListeners;
- typedef ::std::vector<cssu::Reference<css::beans::XVetoableChangeListener> > VetoableListenerContainer;
+ typedef ::std::vector<css::uno::Reference<css::beans::XVetoableChangeListener> > VetoableListenerContainer;
typedef ::std::map<ThemeItem,VetoableListenerContainer> VetoableListeners;
VetoableListeners maVetoableListeners;
@@ -249,7 +247,7 @@ private:
void SetupPropertyMaps (void);
void UpdateTheme (void);
static PropertyType GetPropertyType (const ThemeItem eItem);
- static cssu::Type GetCppuType (const PropertyType eType);
+ static css::uno::Type GetCppuType (const PropertyType eType);
static sal_Int32 GetIndex (
const ThemeItem eItem,
const PropertyType eType);
@@ -267,7 +265,7 @@ private:
const ChangeListenerContainer* pListeners,
const css::beans::PropertyChangeEvent& rEvent) const;
void ProcessNewValue (
- const cssu::Any& rValue,
+ const css::uno::Any& rValue,
const ThemeItem eItem,
const PropertyType eType);
};
diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
index 8c61297..649fdf4 100644
--- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
@@ -29,7 +29,7 @@
#include <svx/sidebar/SidebarDialControl.hxx>
using namespace css;
-using namespace cssu;
+using namespace css::uno;
// namespace open
@@ -37,7 +37,7 @@ namespace sc { namespace sidebar {
AlignmentPropertyPanel::AlignmentPropertyPanel(
Window* pParent,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings)
: PanelLayout(pParent, "AlignmentPropertyPanel", "modules/scalc/ui/sidebaralignment.ui", rxFrame),
maAlignHorControl(SID_H_ALIGNCELL, *pBindings, *this),
@@ -187,7 +187,7 @@ IMPL_LINK(AlignmentPropertyPanel, CBOXWrapTextClkHdl, void*, EMPTYARG)
AlignmentPropertyPanel* AlignmentPropertyPanel::Create (
Window* pParent,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings)
{
if (pParent == NULL)
diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx
index c67e17f..1f0649c 100644
--- a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx
+++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx
@@ -41,7 +41,7 @@ class AlignmentPropertyPanel
public:
static AlignmentPropertyPanel* Create(
Window* pParent,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings);
virtual void DataChanged(
@@ -79,7 +79,7 @@ private:
/// bitfield
bool mbMultiDisable : 1;
- cssu::Reference<css::frame::XFrame> mxFrame;
+ css::uno::Reference<css::frame::XFrame> mxFrame;
::sfx2::sidebar::EnumContext maContext;
SfxBindings* mpBindings;
@@ -93,7 +93,7 @@ private:
// constructor/destuctor
AlignmentPropertyPanel(
Window* pParent,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings);
virtual ~AlignmentPropertyPanel();
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
index 2a1a337..a16668c 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
@@ -45,7 +45,7 @@
#include "CellBorderStylePopup.hxx"
using namespace css;
-using namespace cssu;
+using namespace css::uno;
const char UNO_BACKGROUNDCOLOR[] = ".uno:BackgroundColor";
const char UNO_SETBORDERSTYLE[] = ".uno:SetBorderStyle";
@@ -140,7 +140,7 @@ void CellAppearancePropertyPanel::EndCellBorderStylePopupMode(void)
CellAppearancePropertyPanel::CellAppearancePropertyPanel(
Window* pParent,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings)
: PanelLayout(pParent, "CellAppearancePropertyPanel", "modules/scalc/ui/sidebarcellappearance.ui", rxFrame),
@@ -340,7 +340,7 @@ IMPL_LINK(CellAppearancePropertyPanel, CBOXGridShowClkHdl, void*, EMPTYARG)
CellAppearancePropertyPanel* CellAppearancePropertyPanel::Create (
Window* pParent,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings)
{
if (pParent == NULL)
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
index 4224e39..6538a70 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
@@ -50,7 +50,7 @@ private:
public:
static CellAppearancePropertyPanel* Create(
Window* pParent,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings);
virtual void DataChanged(
@@ -144,7 +144,7 @@ private:
::boost::scoped_ptr< CellLineStylePopup > mpCellLineStylePopup;
::boost::scoped_ptr< CellBorderStylePopup > mpCellBorderStylePopup;
- cssu::Reference<css::frame::XFrame> mxFrame;
+ css::uno::Reference<css::frame::XFrame> mxFrame;
::sfx2::sidebar::EnumContext maContext;
SfxBindings* mpBindings;
@@ -173,7 +173,7 @@ private:
// constructor/destuctor
CellAppearancePropertyPanel(
Window* pParent,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings);
virtual ~CellAppearancePropertyPanel();
diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
index 724413f..3a162f9 100644
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
@@ -34,7 +34,7 @@
#include <svl/stritem.hxx>
using namespace css;
-using namespace cssu;
+using namespace css::uno;
using ::sfx2::sidebar::Theme;
const char UNO_NUMERICFIELD[] = ".uno:NumericField";
@@ -47,7 +47,7 @@ namespace sc { namespace sidebar {
NumberFormatPropertyPanel::NumberFormatPropertyPanel(
Window* pParent,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings)
: PanelLayout(pParent,"NumberFormatPropertyPanel", "modules/scalc/ui/sidebarnumberformat.ui", rxFrame),
maNumFormatControl(SID_NUMBER_TYPE_FORMAT, *pBindings, *this),
@@ -168,7 +168,7 @@ IMPL_LINK( NumberFormatPropertyPanel, NumFormatValueHdl, void*, EMPTYARG )
NumberFormatPropertyPanel* NumberFormatPropertyPanel::Create (
Window* pParent,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings)
{
if (pParent == NULL)
diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx
index 4a0dc7c..3c34b37 100644
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx
@@ -39,7 +39,7 @@ public:
public:
static NumberFormatPropertyPanel* Create(
Window* pParent,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings);
virtual void DataChanged(
@@ -70,7 +70,7 @@ private:
sal_uInt16 mnCategorySelected;
- cssu::Reference<css::frame::XFrame> mxFrame;
+ css::uno::Reference<css::frame::XFrame> mxFrame;
::sfx2::sidebar::EnumContext maContext;
SfxBindings* mpBindings;
@@ -81,7 +81,7 @@ private:
// constructor/destuctor
NumberFormatPropertyPanel(
Window* pParent,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings);
virtual ~NumberFormatPropertyPanel();
diff --git a/sc/source/ui/sidebar/ScPanelFactory.cxx b/sc/source/ui/sidebar/ScPanelFactory.cxx
index 04b0bb9..cd0e946 100644
--- a/sc/source/ui/sidebar/ScPanelFactory.cxx
+++ b/sc/source/ui/sidebar/ScPanelFactory.cxx
@@ -37,7 +37,7 @@
#include <boost/bind.hpp>
using namespace css;
-using namespace cssu;
+using namespace css::uno;
using ::rtl::OUString;
namespace sc { namespace sidebar {
@@ -50,17 +50,17 @@ namespace sc { namespace sidebar {
return OUString(IMPLEMENTATION_NAME);
}
-cssu::Reference<cssu::XInterface> SAL_CALL ScPanelFactory::createInstance(
+css::uno::Reference<css::uno::XInterface> SAL_CALL ScPanelFactory::createInstance(
const uno::Reference<lang::XMultiServiceFactory>& )
{
::rtl::Reference<ScPanelFactory> pPanelFactory (new ScPanelFactory());
- cssu::Reference<cssu::XInterface> xService (static_cast<XWeak*>(pPanelFactory.get()), cssu::UNO_QUERY);
+ css::uno::Reference<css::uno::XInterface> xService (static_cast<XWeak*>(pPanelFactory.get()), css::uno::UNO_QUERY);
return xService;
}
-cssu::Sequence<OUString> SAL_CALL ScPanelFactory::getSupportedServiceNames (void)
+css::uno::Sequence<OUString> SAL_CALL ScPanelFactory::getSupportedServiceNames (void)
{
- cssu::Sequence<OUString> aServiceNames (1);
+ css::uno::Sequence<OUString> aServiceNames (1);
aServiceNames[0] = SERVICE_NAME;
return aServiceNames;
@@ -77,7 +77,7 @@ ScPanelFactory::~ScPanelFactory (void)
Reference<ui::XUIElement> SAL_CALL ScPanelFactory::createUIElement (
const ::rtl::OUString& rsResourceURL,
- const ::cssu::Sequence<css::beans::PropertyValue>& rArguments)
+ const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments)
throw(
container::NoSuchElementException,
lang::IllegalArgumentException,
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 31589bc..4e4fc85 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -147,7 +147,7 @@ void fillRepeatComboBox( ListBox* pBox )
}
CustomAnimationPane::CustomAnimationPane( ::Window* pParent, ViewShellBase& rBase,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
const Size& rMinSize )
: PanelLayout( pParent, "CustomAnimationsPanel", "modules/simpress/ui/customanimationspanel.ui", rxFrame ),
mrBase( rBase ),
@@ -2256,7 +2256,7 @@ void CustomAnimationPane::updatePathFromMotionPathTag( const rtl::Reference< Mot
}
}
-::Window * createCustomAnimationPanel( ::Window* pParent, ViewShellBase& rBase, const cssu::Reference<css::frame::XFrame>& rxFrame )
+::Window * createCustomAnimationPanel( ::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame )
{
::Window* pWindow = 0;
diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx
index e9fbbc1..c8917a9 100644
--- a/sd/source/ui/animations/CustomAnimationPane.hxx
+++ b/sd/source/ui/animations/CustomAnimationPane.hxx
@@ -62,7 +62,7 @@ class CustomAnimationPane : public PanelLayout, public ICustomAnimationListContr
{
friend class MotionPathTag;
public:
- CustomAnimationPane( ::Window* pParent, ViewShellBase& rBase, const cssu::Reference<css::frame::XFrame>& rxFrame, const Size& rMinSize );
+ CustomAnimationPane( ::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame, const Size& rMinSize );
virtual ~CustomAnimationPane();
// callbacks
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 4a93124..36622c7 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -414,7 +414,7 @@ SlideTransitionPane::SlideTransitionPane(
ViewShellBase & rBase,
const Size& rMinSize,
SdDrawDocument* pDoc,
- const cssu::Reference<css::frame::XFrame>& rxFrame ) :
+ const css::uno::Reference<css::frame::XFrame>& rxFrame ) :
PanelLayout( pParent, "SlideTransitionsPanel", "modules/simpress/ui/slidetransitionspanel.ui", rxFrame ),
mrBase( rBase ),
@@ -1069,7 +1069,7 @@ IMPL_LINK_NOARG(SlideTransitionPane, LateInitCallback)
return 0;
}
-::Window * createSlideTransitionPanel( ::Window* pParent, ViewShellBase& rBase, const cssu::Reference<css::frame::XFrame>& rxFrame )
+::Window * createSlideTransitionPanel( ::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame )
{
::Window* pWindow = 0;
diff --git a/sd/source/ui/animations/SlideTransitionPane.hxx b/sd/source/ui/animations/SlideTransitionPane.hxx
index 545f4e5..13ca6cd 100644
--- a/sd/source/ui/animations/SlideTransitionPane.hxx
+++ b/sd/source/ui/animations/SlideTransitionPane.hxx
@@ -56,7 +56,7 @@ public:
ViewShellBase & rBase,
const Size& rMinSize,
SdDrawDocument* pDoc,
- const cssu::Reference<css::frame::XFrame>& rxFrame );
+ const css::uno::Reference<css::frame::XFrame>& rxFrame );
virtual ~SlideTransitionPane();
// Window
diff --git a/sd/source/ui/inc/createcustomanimationpanel.hxx b/sd/source/ui/inc/createcustomanimationpanel.hxx
index 6cf1e6a..a9f1a63 100644
--- a/sd/source/ui/inc/createcustomanimationpanel.hxx
+++ b/sd/source/ui/inc/createcustomanimationpanel.hxx
@@ -24,7 +24,7 @@
namespace sd {
-::Window * createCustomAnimationPanel (::Window* pParent, ViewShellBase& rBase, const cssu::Reference<css::frame::XFrame>& rxFrame);
+::Window * createCustomAnimationPanel (::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame);
}
diff --git a/sd/source/ui/inc/createslidetransitionpanel.hxx b/sd/source/ui/inc/createslidetransitionpanel.hxx
index db9c607..b74a3fa 100644
--- a/sd/source/ui/inc/createslidetransitionpanel.hxx
+++ b/sd/source/ui/inc/createslidetransitionpanel.hxx
@@ -24,7 +24,7 @@
namespace sd {
-::Window* createSlideTransitionPanel (::Window* pParent, ViewShellBase& rBase, const cssu::Reference<css::frame::XFrame>& rxFrame);
+::Window* createSlideTransitionPanel (::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame);
}
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index a6fa641..832e315 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -123,7 +123,7 @@ static const snewfoil_value_info standard[] =
LayoutMenu::LayoutMenu (
::Window* pParent,
ViewShellBase& rViewShellBase,
- const cssu::Reference<css::ui::XSidebar>& rxSidebar)
+ const css::uno::Reference<css::ui::XSidebar>& rxSidebar)
: ValueSet (pParent, WB_ITEMBORDER),
DragSourceHelper(this),
DropTargetHelper(this),
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx
index dbff168..a960290 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx
@@ -65,7 +65,7 @@ MasterPagesSelector::MasterPagesSelector (
SdDrawDocument& rDocument,
ViewShellBase& rBase,
const ::boost::shared_ptr<MasterPageContainer>& rpContainer,
- const cssu::Reference<css::ui::XSidebar>& rxSidebar)
+ const css::uno::Reference<css::ui::XSidebar>& rxSidebar)
: PreviewValueSet(pParent),
maMutex(),
mpContainer(rpContainer),
diff --git a/sd/source/ui/sidebar/PanelFactory.cxx b/sd/source/ui/sidebar/PanelFactory.cxx
index 678efe4..8d38c4c 100644
--- a/sd/source/ui/sidebar/PanelFactory.cxx
+++ b/sd/source/ui/sidebar/PanelFactory.cxx
@@ -38,7 +38,7 @@
#include <toolkit/helper/vclunohelper.hxx>
using namespace css;
-using namespace cssu;
+using namespace css::uno;
using namespace ::sd::framework;
using ::rtl::OUString;
@@ -105,7 +105,7 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement (
throw(
css::container::NoSuchElementException,
css::lang::IllegalArgumentException,
- cssu::RuntimeException, std::exception)
+ css::uno::RuntimeException, std::exception)
{
// Process arguments.
const ::comphelper::NamedValueCollection aArguments (rArguments);
diff --git a/sfx2/source/sidebar/CommandInfoProvider.cxx b/sfx2/source/sidebar/CommandInfoProvider.cxx
index 54589df..1909a9d 100644
--- a/sfx2/source/sidebar/CommandInfoProvider.cxx
+++ b/sfx2/source/sidebar/CommandInfoProvider.cxx
@@ -31,11 +31,10 @@
#include <com/sun/star/ui/theModuleUIConfigurationManagerSupplier.hpp>
using namespace css;
-using namespace cssu;
+using namespace css::uno;
using ::rtl::OUString;
-
namespace
{
typedef ::cppu::WeakComponentImplHelper1 <
@@ -63,7 +62,7 @@ namespace
mxFrame->removeEventListener(this);
}
virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent)
- throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{
(void)rEvent;
mrInfoProvider.SetFrame(NULL);
diff --git a/sfx2/source/sidebar/ControllerFactory.cxx b/sfx2/source/sidebar/ControllerFactory.cxx
index 3a6e294..8a2b864 100644
--- a/sfx2/source/sidebar/ControllerFactory.cxx
+++ b/sfx2/source/sidebar/ControllerFactory.cxx
@@ -33,7 +33,7 @@
using namespace css;
-using namespace cssu;
+using namespace css::uno;
using ::rtl::OUString;
diff --git a/sfx2/source/sidebar/ControllerItem.cxx b/sfx2/source/sidebar/ControllerItem.cxx
index 6caa99e..bf817cd 100644
--- a/sfx2/source/sidebar/ControllerItem.cxx
+++ b/sfx2/source/sidebar/ControllerItem.cxx
@@ -33,7 +33,7 @@
using namespace css;
-using namespace cssu;
+using namespace css::uno;
namespace
@@ -66,14 +66,14 @@ namespace
mxFrame->removeFrameActionListener(this);
}
virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent)
- throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{
(void)rEvent;
mrControllerItem.ResetFrame();
mxFrame = NULL;
}
virtual void SAL_CALL frameAction (const css::frame::FrameActionEvent& rEvent)
- throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{
if (rEvent.Action == frame::FrameAction_CONTEXT_CHANGED)
mrControllerItem.NotifyFrameContextChange();
diff --git a/sfx2/source/sidebar/DeckTitleBar.cxx b/sfx2/source/sidebar/DeckTitleBar.cxx
index 49cbacf..fb1a6a0 100644
--- a/sfx2/source/sidebar/DeckTitleBar.cxx
+++ b/sfx2/source/sidebar/DeckTitleBar.cxx
@@ -135,7 +135,7 @@ void DeckTitleBar::HandleToolBoxItemClick (const sal_uInt16 nItemIndex)
-cssu::Reference<css::accessibility::XAccessible> DeckTitleBar::CreateAccessible (void)
+css::uno::Reference<css::accessibility::XAccessible> DeckTitleBar::CreateAccessible (void)
{
const ::rtl::OUString sAccessibleName(msTitle);
SetAccessibleName(sAccessibleName);
diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx
index 083d15b..b96b439 100644
--- a/sfx2/source/sidebar/Panel.cxx
+++ b/sfx2/source/sidebar/Panel.cxx
@@ -40,8 +40,7 @@
using namespace css;
-using namespace cssu;
-
+using namespace css::uno;
namespace sfx2 { namespace sidebar {
diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx b/sfx2/source/sidebar/PanelTitleBar.cxx
index c7de577..151d423 100644
--- a/sfx2/source/sidebar/PanelTitleBar.cxx
+++ b/sfx2/source/sidebar/PanelTitleBar.cxx
@@ -32,7 +32,7 @@
#include <toolkit/helper/vclunohelper.hxx>
using namespace css;
-using namespace cssu;
+using namespace css::uno;
namespace sfx2 { namespace sidebar {
diff --git a/sfx2/source/sidebar/Sidebar.cxx b/sfx2/source/sidebar/Sidebar.cxx
index f93502f..245307c 100644
--- a/sfx2/source/sidebar/Sidebar.cxx
+++ b/sfx2/source/sidebar/Sidebar.cxx
@@ -22,14 +22,13 @@
#include "ResourceManager.hxx"
using namespace css;
-using namespace cssu;
namespace sfx2 { namespace sidebar {
void Sidebar::ShowPanel (
const ::rtl::OUString& rsPanelId,
- const Reference<frame::XFrame>& rxFrame)
+ const css::uno::Reference<frame::XFrame>& rxFrame)
{
SidebarController* pController = SidebarController::GetSidebarControllerForFrame(rxFrame);
const PanelDescriptor* pPanelDescriptor = ResourceManager::Instance().GetPanelDescriptor(rsPanelId);
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 2b32ba7..ed88617 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -57,7 +57,7 @@
using namespace css;
-using namespace cssu;
+using namespace css::uno;
using ::rtl::OUString;
@@ -95,7 +95,7 @@ namespace {
SidebarController::SidebarController (
SidebarDockingWindow* pParentWindow,
- const cssu::Reference<css::frame::XFrame>& rxFrame)
+ const css::uno::Reference<css::frame::XFrame>& rxFrame)
: SidebarControllerInterfaceBase(m_aMutex),
mpCurrentDeck(),
mpParentWindow(pParentWindow),
@@ -131,7 +131,7 @@ SidebarController::SidebarController (
}
// Listen for context change events.
- cssu::Reference<css::ui::XContextChangeEventMultiplexer> xMultiplexer (
+ css::uno::Reference<css::ui::XContextChangeEventMultiplexer> xMultiplexer (
css::ui::ContextChangeEventMultiplexer::get(
::comphelper::getProcessComponentContext()));
if (xMultiplexer.is())
@@ -174,13 +174,13 @@ SidebarController::~SidebarController (void)
SidebarController* SidebarController::GetSidebarControllerForFrame (
- const cssu::Reference<css::frame::XFrame>& rxFrame)
+ const css::uno::Reference<css::frame::XFrame>& rxFrame)
{
SidebarControllerContainer::iterator iEntry (maSidebarControllerContainer.find(rxFrame));
if (iEntry == maSidebarControllerContainer.end())
return NULL;
- cssu::Reference<XInterface> xController (iEntry->second.get());
+ css::uno::Reference<XInterface> xController (iEntry->second.get());
if ( ! xController.is())
return NULL;
@@ -198,7 +198,7 @@ void SAL_CALL SidebarController::disposing (void)
maFocusManager.Clear();
- cssu::Reference<css::ui::XContextChangeEventMultiplexer> xMultiplexer (
+ css::uno::Reference<css::ui::XContextChangeEventMultiplexer> xMultiplexer (
css::ui::ContextChangeEventMultiplexer::get(
::comphelper::getProcessComponentContext()));
if (xMultiplexer.is())
@@ -240,7 +240,7 @@ void SAL_CALL SidebarController::disposing (void)
void SAL_CALL SidebarController::notifyContextChangeEvent (const css::ui::ContextChangeEventObject& rEvent)
- throw(cssu::RuntimeException, std::exception)
+ throw(css::uno::RuntimeException, std::exception)
{
// Update to the requested new context asynchronously to avoid
// subtle errors caused by SFX2 which in rare cases can not
@@ -259,7 +259,7 @@ void SAL_CALL SidebarController::notifyContextChangeEvent (const css::ui::Contex
void SAL_CALL SidebarController::disposing (const css::lang::EventObject& rEventObject)
- throw(cssu::RuntimeException, std::exception)
+ throw(css::uno::RuntimeException, std::exception)
{
(void)rEventObject;
@@ -270,7 +270,7 @@ void SAL_CALL SidebarController::disposing (const css::lang::EventObject& rEvent
void SAL_CALL SidebarController::propertyChange (const css::beans::PropertyChangeEvent& rEvent)
- throw(cssu::RuntimeException, std::exception)
+ throw(css::uno::RuntimeException, std::exception)
{
(void)rEvent;
@@ -281,7 +281,7 @@ void SAL_CALL SidebarController::propertyChange (const css::beans::PropertyChang
void SAL_CALL SidebarController::statusChanged (const css::frame::FeatureStateEvent& rEvent)
- throw(cssu::RuntimeException, std::exception)
+ throw(css::uno::RuntimeException, std::exception)
{
bool bIsReadWrite (true);
if (rEvent.IsEnabled)
@@ -304,7 +304,7 @@ void SAL_CALL SidebarController::statusChanged (const css::frame::FeatureStateEv
void SAL_CALL SidebarController::requestLayout (void)
- throw(cssu::RuntimeException, std::exception)
+ throw(css::uno::RuntimeException, std::exception)
{
sal_Int32 nMinimalWidth = 0;
if (mpCurrentDeck)
diff --git a/sfx2/source/sidebar/SidebarPanelBase.cxx b/sfx2/source/sidebar/SidebarPanelBase.cxx
index 77a34a0..8e4c9b0 100644
--- a/sfx2/source/sidebar/SidebarPanelBase.cxx
+++ b/sfx2/source/sidebar/SidebarPanelBase.cxx
@@ -29,14 +29,14 @@
#include <com/sun/star/ui/UIElementType.hpp>
using namespace css;
-using namespace cssu;
+using namespace css::uno;
namespace sfx2 { namespace sidebar {
Reference<ui::XUIElement> SidebarPanelBase::Create (
const ::rtl::OUString& rsResourceURL,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
Window* pWindow,
const css::ui::LayoutSize& rLayoutSize)
{
@@ -54,7 +54,7 @@ Reference<ui::XUIElement> SidebarPanelBase::Create (
SidebarPanelBase::SidebarPanelBase (
const ::rtl::OUString& rsResourceURL,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
Window* pWindow,
const css::ui::LayoutSize& rLayoutSize)
: SidebarPanelBaseInterfaceBase(m_aMutex),
@@ -65,7 +65,7 @@ SidebarPanelBase::SidebarPanelBase (
{
if (mxFrame.is())
{
- cssu::Reference<css::ui::XContextChangeEventMultiplexer> xMultiplexer (
+ css::uno::Reference<css::ui::XContextChangeEventMultiplexer> xMultiplexer (
css::ui::ContextChangeEventMultiplexer::get(
::comphelper::getProcessComponentContext()));
if (xMultiplexer.is())
@@ -89,7 +89,7 @@ SidebarPanelBase::~SidebarPanelBase (void)
void SAL_CALL SidebarPanelBase::disposing (void)
- throw (cssu::RuntimeException)
+ throw (css::uno::RuntimeException)
{
if (mpControl != NULL)
{
@@ -99,7 +99,7 @@ void SAL_CALL SidebarPanelBase::disposing (void)
if (mxFrame.is())
{
- cssu::Reference<css::ui::XContextChangeEventMultiplexer> xMultiplexer (
+ css::uno::Reference<css::ui::XContextChangeEventMultiplexer> xMultiplexer (
css::ui::ContextChangeEventMultiplexer::get(
::comphelper::getProcessComponentContext()));
if (xMultiplexer.is())
@@ -114,7 +114,7 @@ void SAL_CALL SidebarPanelBase::disposing (void)
// XContextChangeEventListener
void SAL_CALL SidebarPanelBase::notifyContextChangeEvent (
const ui::ContextChangeEventObject& rEvent)
- throw (cssu::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
IContextChangeReceiver* pContextChangeReceiver
= dynamic_cast<IContextChangeReceiver*>(mpControl);
@@ -132,7 +132,7 @@ void SAL_CALL SidebarPanelBase::notifyContextChangeEvent (
void SAL_CALL SidebarPanelBase::disposing (
const css::lang::EventObject& rEvent)
- throw (cssu::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
(void)rEvent;
@@ -143,8 +143,8 @@ void SAL_CALL SidebarPanelBase::disposing (
-cssu::Reference<css::frame::XFrame> SAL_CALL SidebarPanelBase::getFrame (void)
- throw(cssu::RuntimeException, std::exception)
+css::uno::Reference<css::frame::XFrame> SAL_CALL SidebarPanelBase::getFrame (void)
+ throw(css::uno::RuntimeException, std::exception)
{
return mxFrame;
}
@@ -153,7 +153,7 @@ cssu::Reference<css::frame::XFrame> SAL_CALL SidebarPanelBase::getFrame (void)
::rtl::OUString SAL_CALL SidebarPanelBase::getResourceURL (void)
- throw(cssu::RuntimeException, std::exception)
+ throw(css::uno::RuntimeException, std::exception)
{
return msResourceURL;
}
@@ -162,7 +162,7 @@ cssu::Reference<css::frame::XFrame> SAL_CALL SidebarPanelBase::getFrame (void)
sal_Int16 SAL_CALL SidebarPanelBase::getType (void)
- throw(cssu::RuntimeException, std::exception)
+ throw(css::uno::RuntimeException, std::exception)
{
return ui::UIElementType::TOOLPANEL;
}
@@ -171,7 +171,7 @@ sal_Int16 SAL_CALL SidebarPanelBase::getType (void)
Reference<XInterface> SAL_CALL SidebarPanelBase::getRealInterface (void)
- throw(cssu::RuntimeException, std::exception)
+ throw(css::uno::RuntimeException, std::exception)
{
return Reference<XInterface>(static_cast<XWeak*>(this));
}
@@ -181,7 +181,7 @@ Reference<XInterface> SAL_CALL SidebarPanelBase::getRealInterface (void)
Reference<accessibility::XAccessible> SAL_CALL SidebarPanelBase::createAccessible (
const Reference<accessibility::XAccessible>& rxParentAccessible)
- throw(cssu::RuntimeException, std::exception)
+ throw(css::uno::RuntimeException, std::exception)
{
(void)rxParentAccessible;
@@ -193,7 +193,7 @@ Reference<accessibility::XAccessible> SAL_CALL SidebarPanelBase::createAccessibl
Reference<awt::XWindow> SAL_CALL SidebarPanelBase::getWindow (void)
- throw(cssu::RuntimeException, std::exception)
+ throw(css::uno::RuntimeException, std::exception)
{
if (mpControl != NULL)
return Reference<awt::XWindow>(
@@ -207,7 +207,7 @@ Reference<awt::XWindow> SAL_CALL SidebarPanelBase::getWindow (void)
ui::LayoutSize SAL_CALL SidebarPanelBase::getHeightForWidth (const sal_Int32 nWidth)
- throw(cssu::RuntimeException, std::exception)
+ throw(css::uno::RuntimeException, std::exception)
{
if (maLayoutSize.Minimum >= 0)
return maLayoutSize;
@@ -233,7 +233,7 @@ ui::LayoutSize SAL_CALL SidebarPanelBase::getHeightForWidth (const sal_Int32 nWi
return ui::LayoutSize(0,0,0);
}
-sal_Int32 SAL_CALL SidebarPanelBase::getMinimalWidth () throw(cssu::RuntimeException, std::exception)
+sal_Int32 SAL_CALL SidebarPanelBase::getMinimalWidth () throw(css::uno::RuntimeException, std::exception)
{
if (isLayoutEnabled(mpControl))
{
diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx
index 70eba9c..f6f1e5c 100644
--- a/sfx2/source/sidebar/SidebarToolBox.cxx
+++ b/sfx2/source/sidebar/SidebarToolBox.cxx
@@ -30,8 +30,8 @@
#include <com/sun/star/frame/XSubToolbarController.hpp>
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
+using namespace css;
+using namespace css::uno;
using ::rtl::OUString;
@@ -138,7 +138,7 @@ bool SidebarToolBox::Notify (NotifyEvent& rEvent)
void SidebarToolBox::CreateController (
const sal_uInt16 nItemId,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
const sal_Int32 nItemWidth)
{
ItemDescriptor aDescriptor;
@@ -178,7 +178,7 @@ Reference<frame::XToolbarController> SidebarToolBox::GetControllerForItemId (con
void SidebarToolBox::SetController(
const sal_uInt16 nItemId,
- const cssu::Reference<css::frame::XToolbarController>& rxController,
+ const css::uno::Reference<css::frame::XToolbarController>& rxController,
const ::rtl::OUString& rsCommandName)
{
ItemDescriptor aDescriptor;
diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index 2f5d228..4acbe85 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -28,7 +28,7 @@
#include <vcl/settings.hxx>
using namespace css;
-using namespace cssu;
+using namespace css::uno;
namespace sfx2 { namespace sidebar {
@@ -468,14 +468,14 @@ Reference<beans::XPropertySet> Theme::GetPropertySet (void)
Reference<beans::XPropertySetInfo> SAL_CALL Theme::getPropertySetInfo (void)
- throw(cssu::RuntimeException, std::exception)
+ throw(css::uno::RuntimeException, std::exception)
{
return Reference<beans::XPropertySetInfo>(this);
}
void SAL_CALL Theme::setPropertyValue (
const ::rtl::OUString& rsPropertyName,
- const cssu::Any& rValue)
+ const css::uno::Any& rValue)
throw (css::beans::UnknownPropertyException,
css::uno::RuntimeException,
std::exception)
@@ -523,7 +523,7 @@ Any SAL_CALL Theme::getPropertyValue (
const ::rtl::OUString& rsPropertyName)
throw(css::beans::UnknownPropertyException,
css::lang::WrappedTargetException,
- cssu::RuntimeException, std::exception)
+ css::uno::RuntimeException, std::exception)
{
PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
if (iId == maPropertyNameToIdMap.end())
@@ -543,10 +543,10 @@ Any SAL_CALL Theme::getPropertyValue (
void SAL_CALL Theme::addPropertyChangeListener(
const ::rtl::OUString& rsPropertyName,
- const cssu::Reference<css::beans::XPropertyChangeListener>& rxListener)
+ const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener)
throw(css::beans::UnknownPropertyException,
css::lang::WrappedTargetException,
- cssu::RuntimeException, std::exception)
+ css::uno::RuntimeException, std::exception)
{
ThemeItem eItem (__AnyItem);
if (rsPropertyName.getLength() > 0)
@@ -571,10 +571,10 @@ void SAL_CALL Theme::addPropertyChangeListener(
void SAL_CALL Theme::removePropertyChangeListener(
const ::rtl::OUString& rsPropertyName,
- const cssu::Reference<css::beans::XPropertyChangeListener>& rxListener)
+ const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener)
throw(css::beans::UnknownPropertyException,
css::lang::WrappedTargetException,
- cssu::RuntimeException, std::exception)
+ css::uno::RuntimeException, std::exception)
{
ThemeItem eItem (__AnyItem);
if (rsPropertyName.getLength() > 0)
@@ -609,10 +609,10 @@ void SAL_CALL Theme::removePropertyChangeListener(
void SAL_CALL Theme::addVetoableChangeListener(
const ::rtl::OUString& rsPropertyName,
- const cssu::Reference<css::beans::XVetoableChangeListener>& rxListener)
+ const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener)
throw(css::beans::UnknownPropertyException,
css::lang::WrappedTargetException,
- cssu::RuntimeException, std::exception)
+ css::uno::RuntimeException, std::exception)
{
ThemeItem eItem (__AnyItem);
if (rsPropertyName.getLength() > 0)
@@ -637,10 +637,10 @@ void SAL_CALL Theme::addVetoableChangeListener(
void SAL_CALL Theme::removeVetoableChangeListener(
const ::rtl::OUString& rsPropertyName,
- const cssu::Reference<css::beans::XVetoableChangeListener>& rxListener)
+ const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener)
throw(css::beans::UnknownPropertyException,
css::lang::WrappedTargetException,
- cssu::RuntimeException, std::exception)
+ css::uno::RuntimeException, std::exception)
{
ThemeItem eItem (__AnyItem);
if (rsPropertyName.getLength() > 0)
@@ -672,8 +672,8 @@ void SAL_CALL Theme::removeVetoableChangeListener(
-cssu::Sequence<css::beans::Property> SAL_CALL Theme::getProperties (void)
- throw(cssu::RuntimeException, std::exception)
+css::uno::Sequence<css::beans::Property> SAL_CALL Theme::getProperties (void)
+ throw(css::uno::RuntimeException, std::exception)
{
::std::vector<beans::Property> aProperties;
@@ -692,7 +692,7 @@ cssu::Sequence<css::beans::Property> SAL_CALL Theme::getProperties (void)
aProperties.push_back(aProperty);
}
- return cssu::Sequence<css::beans::Property>(
+ return css::uno::Sequence<css::beans::Property>(
&aProperties.front(),
aProperties.size());
}
@@ -702,7 +702,7 @@ cssu::Sequence<css::beans::Property> SAL_CALL Theme::getProperties (void)
beans::Property SAL_CALL Theme::getPropertyByName (const ::rtl::OUString& rsPropertyName)
throw(css::beans::UnknownPropertyException,
- cssu::RuntimeException, std::exception)
+ css::uno::RuntimeException, std::exception)
{
PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
if (iId == maPropertyNameToIdMap.end())
@@ -725,7 +725,7 @@ beans::Property SAL_CALL Theme::getPropertyByName (const ::rtl::OUString& rsProp
sal_Bool SAL_CALL Theme::hasPropertyByName (const ::rtl::OUString& rsPropertyName)
- throw(cssu::RuntimeException, std::exception)
+ throw(css::uno::RuntimeException, std::exception)
{
PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
if (iId == maPropertyNameToIdMap.end())
@@ -895,7 +895,7 @@ Theme::PropertyType Theme::GetPropertyType (const ThemeItem eItem)
-cssu::Type Theme::GetCppuType (const PropertyType eType)
+css::uno::Type Theme::GetCppuType (const PropertyType eType)
{
switch(eType)
{
diff --git a/sfx2/source/sidebar/TitleBar.hxx b/sfx2/source/sidebar/TitleBar.hxx
index 56ab6b9..a499bca 100644
--- a/sfx2/source/sidebar/TitleBar.hxx
+++ b/sfx2/source/sidebar/TitleBar.hxx
@@ -62,7 +62,7 @@ protected:
virtual sidebar::Paint GetBackgroundPaint (void) = 0;
virtual Color GetTextColor (void) = 0;
virtual void HandleToolBoxItemClick (const sal_uInt16 nItemIndex);
- virtual cssu::Reference<css::accessibility::XAccessible> CreateAccessible (void) SAL_OVERRIDE;
+ virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible (void) SAL_OVERRIDE;
private:
Image maIcon;
diff --git a/sfx2/source/sidebar/Tools.cxx b/sfx2/source/sidebar/Tools.cxx
index a1c63b2..09bf49f 100644
--- a/sfx2/source/sidebar/Tools.cxx
+++ b/sfx2/source/sidebar/Tools.cxx
@@ -34,7 +34,7 @@
#include <cstring>
using namespace css;
-using namespace cssu;
+using namespace css::uno;
namespace sfx2 { namespace sidebar {
@@ -153,7 +153,7 @@ util::URL Tools::GetURL (const ::rtl::OUString& rsCommand)
Reference<frame::XDispatch> Tools::GetDispatch (
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
const util::URL& rURL)
{
Reference<frame::XDispatchProvider> xProvider (rxFrame, UNO_QUERY_THROW);
@@ -165,7 +165,7 @@ Reference<frame::XDispatch> Tools::GetDispatch (
::rtl::OUString Tools::GetModuleName (
- const cssu::Reference<css::frame::XFrame>& rxFrame)
+ const css::uno::Reference<css::frame::XFrame>& rxFrame)
{
if ( ! rxFrame.is() || ! rxFrame->getController().is())
return ::rtl::OUString();
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx
index 885a408..dc283b9 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx
@@ -43,7 +43,7 @@
#include <boost/bind.hpp>
using namespace css;
-using namespace cssu;
+using namespace css::uno;
using ::sfx2::sidebar::Theme;
const char UNO_SIDEBARCOLOR[] = ".uno:sidebarcolor";
@@ -61,7 +61,7 @@ const sal_Int32 AreaPropertyPanel::DEFAULT_BORDER = 0;
AreaPropertyPanel::AreaPropertyPanel(
Window* pParent,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings)
: PanelLayout(pParent, "AreaPropertyPanel", "svx/ui/sidebararea.ui", rxFrame),
meLastXFS(static_cast<sal_uInt16>(-1)),
@@ -579,7 +579,7 @@ void AreaPropertyPanel::SetupIcons(void)
AreaPropertyPanel* AreaPropertyPanel::Create (
Window* pParent,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings)
{
if (pParent == NULL)
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hxx b/svx/source/sidebar/area/AreaPropertyPanel.hxx
index 13f76b5..e1b34c4 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.hxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.hxx
@@ -58,7 +58,7 @@ class AreaPropertyPanel
public:
static AreaPropertyPanel* Create(
Window* pParent,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings);
virtual void DataChanged(
@@ -146,7 +146,7 @@ private:
::boost::scoped_ptr< XFillFloatTransparenceItem > mpFloatTransparenceItem;
::boost::scoped_ptr< SfxUInt16Item > mpTransparanceItem;
- cssu::Reference<css::frame::XFrame> mxFrame;
+ css::uno::Reference<css::frame::XFrame> mxFrame;
SfxBindings* mpBindings;
/// bitfield
@@ -168,7 +168,7 @@ private:
// constructor/destuctor
AreaPropertyPanel(
Window* pParent,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings);
virtual ~AreaPropertyPanel(void);
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
index 58e8cd2c..7c660c5 100644
--- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
@@ -29,7 +29,7 @@
#include <sfx2/dispatch.hxx>
using namespace css;
-using namespace cssu;
+using namespace css::uno;
using ::sfx2::sidebar::Theme;
@@ -41,7 +41,7 @@ namespace svx { namespace sidebar {
GraphicPropertyPanel::GraphicPropertyPanel(
Window* pParent,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings)
: PanelLayout(pParent, "GraphicPropertyPanel", "svx/ui/sidebargraphic.ui", rxFrame),
maBrightControl(SID_ATTR_GRAF_LUMINANCE, *pBindings, *this),
@@ -223,7 +223,7 @@ void GraphicPropertyPanel::SetupIcons(void)
GraphicPropertyPanel* GraphicPropertyPanel::Create (
Window* pParent,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings)
{
if (pParent == NULL)
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
index a7ac8eb..e60d52d 100644
--- a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
@@ -41,7 +41,7 @@ class GraphicPropertyPanel
public:
static GraphicPropertyPanel* Create(
Window* pParent,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings);
virtual void DataChanged(
@@ -80,7 +80,7 @@ private:
OUString msGray;
OUString msWater;
- cssu::Reference<css::frame::XFrame> mxFrame;
+ css::uno::Reference<css::frame::XFrame> mxFrame;
SfxBindings* mpBindings;
DECL_LINK( ModifyBrightnessHdl, void * );
@@ -96,7 +96,7 @@ private:
// constructor/destuctor
GraphicPropertyPanel(
Window* pParent,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings);
virtual ~GraphicPropertyPanel();
diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.cxx b/svx/source/sidebar/insert/InsertPropertyPanel.cxx
index 9cc47bc..b7ae54d 100644
--- a/svx/source/sidebar/insert/InsertPropertyPanel.cxx
+++ b/svx/source/sidebar/insert/InsertPropertyPanel.cxx
@@ -38,7 +38,7 @@
#include <com/sun/star/frame/XStatusListener.hpp>
using namespace css;
-using namespace cssu;
+using namespace css::uno;
using ::rtl::OUString;
using ::sfx2::sidebar::SidebarToolBox;
@@ -47,7 +47,7 @@ namespace svx { namespace sidebar {
InsertPropertyPanel::InsertPropertyPanel (
Window* pParent,
- const cssu::Reference<css::frame::XFrame>& rxFrame)
+ const css::uno::Reference<css::frame::XFrame>& rxFrame)
: PanelLayout(pParent, "InsertPropertyPanel", "svx/ui/sidebarinsert.ui", rxFrame),
mxFrame(rxFrame)
{
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx
index 7150060..a85875e 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -56,7 +56,7 @@
#include <boost/scoped_ptr.hpp>
using namespace css;
-using namespace cssu;
+using namespace css::uno;
using ::sfx2::sidebar::Theme;
const char UNO_SELECTWIDTH[] = ".uno:SelectWidth";
@@ -155,7 +155,7 @@ namespace svx { namespace sidebar {
LinePropertyPanel::LinePropertyPanel(
Window* pParent,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings)
: PanelLayout(pParent, "LinePropertyPanel", "svx/ui/sidebarline.ui", rxFrame),
maStyleControl(SID_ATTR_LINE_STYLE, *pBindings, *this),
@@ -301,7 +301,7 @@ void LinePropertyPanel::SetupIcons(void)
LinePropertyPanel* LinePropertyPanel::Create (
Window* pParent,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings)
{
if (pParent == NULL)
diff --git a/svx/source/sidebar/line/LinePropertyPanel.hxx b/svx/source/sidebar/line/LinePropertyPanel.hxx
index c22268f..0cdf79d 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.hxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.hxx
@@ -62,7 +62,7 @@ class LinePropertyPanel
public:
static LinePropertyPanel* Create(
Window* pParent,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings);
virtual void DataChanged(
@@ -136,7 +136,7 @@ private:
// multi-images
::boost::scoped_array<Image> mpIMGWidthIcon;
- cssu::Reference< css::frame::XFrame > mxFrame;
+ css::uno::Reference< css::frame::XFrame > mxFrame;
SfxBindings* mpBindings;
/// bitfield
@@ -163,7 +163,7 @@ private:
// constructor/destuctor
LinePropertyPanel(
Window* pParent,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings);
virtual ~LinePropertyPanel(void);
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 2df7827..d8742cf 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -46,7 +46,7 @@
#include <svtools/unitconv.hxx>
#include <boost/bind.hpp>
using namespace css;
-using namespace cssu;
+using namespace css::uno;
const char UNO_DEFAULTBULLET[] = ".uno:DefaultBullet";
const char UNO_DEFAULTNUMBERING[] = ".uno:DefaultNumbering";
@@ -80,9 +80,9 @@ namespace svx {namespace sidebar {
ParaPropertyPanel* ParaPropertyPanel::Create (
Window* pParent,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings,
- const cssu::Reference<css::ui::XSidebar>& rxSidebar)
+ const css::uno::Reference<css::ui::XSidebar>& rxSidebar)
{
if (pParent == NULL)
throw lang::IllegalArgumentException("no parent Window given to ParaPropertyPanel::Create", NULL, 0);
@@ -1091,9 +1091,9 @@ PopupControl* ParaPropertyPanel::CreateBGColorPopupControl (PopupContainer* pPar
ParaPropertyPanel::ParaPropertyPanel(Window* pParent,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings,
- const cssu::Reference<css::ui::XSidebar>& rxSidebar)
+ const css::uno::Reference<css::ui::XSidebar>& rxSidebar)
: PanelLayout(pParent, "ParaPropertyPanel", "svx/ui/sidebarparagraph.ui", rxFrame),
mpColorUpdater (),
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
index 9e52c67..6b06910 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
@@ -48,8 +48,6 @@
class FloatingWindow;
class ToolBox;
-namespace cssu = ::com::sun::star::uno;
-
namespace svx { namespace sidebar {
@@ -64,9 +62,9 @@ class ParaPropertyPanel
public:
static ParaPropertyPanel* Create (
Window* pParent,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings,
- const cssu::Reference<css::ui::XSidebar>& rxSidebar);
+ const css::uno::Reference<css::ui::XSidebar>& rxSidebar);
virtual void DataChanged (const DataChangedEvent& rEvent) SAL_OVERRIDE;
SfxBindings* GetBindings() { return mpBindings;}
@@ -148,21 +146,21 @@ private:
::sfx2::sidebar::ControllerItem maBulletNumRuleIndex;
::sfx2::sidebar::ControllerItem maNumNumRuleIndex;
- cssu::Reference<css::frame::XFrame> mxFrame;
+ css::uno::Reference<css::frame::XFrame> mxFrame;
::sfx2::sidebar::EnumContext maContext;
SfxBindings* mpBindings;
ParaLineSpacingPopup maLineSpacePopup;
ParaBulletsPopup maBulletsPopup;
ParaNumberingPopup maNumberingPopup;
ColorPopup maBGColorPopup;
- cssu::Reference<css::ui::XSidebar> mxSidebar;
+ css::uno::Reference<css::ui::XSidebar> mxSidebar;
ParaPropertyPanel (
Window* pParent,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings,
- const cssu::Reference<css::ui::XSidebar>& rxSidebar);
+ const css::uno::Reference<css::ui::XSidebar>& rxSidebar);
virtual ~ParaPropertyPanel (void);
DECL_LINK(NumBTbxSelectHandler, ToolBox*);
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index c0b40e4..7f5c40e 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -39,7 +39,7 @@
#include <svx/svdview.hxx>
using namespace css;
-using namespace cssu;
+using namespace css::uno;
using ::sfx2::sidebar::Theme;
const char UNO_FLIPHORIZONTAL[] = ".uno:FlipHorizontal";
@@ -53,9 +53,9 @@ namespace svx { namespace sidebar {
PosSizePropertyPanel::PosSizePropertyPanel(
Window* pParent,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings,
- const cssu::Reference<css::ui::XSidebar>& rxSidebar)
+ const css::uno::Reference<css::ui::XSidebar>& rxSidebar)
: PanelLayout(pParent, "PosSizePropertyPanel", "svx/ui/sidebarpossize.ui", rxFrame),
maRect(),
mpView(0),
@@ -229,9 +229,9 @@ void PosSizePropertyPanel::SetupIcons(void)
PosSizePropertyPanel* PosSizePropertyPanel::Create (
Window* pParent,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings,
- const cssu::Reference<css::ui::XSidebar>& rxSidebar)
+ const css::uno::Reference<css::ui::XSidebar>& rxSidebar)
{
if (pParent == NULL)
throw lang::IllegalArgumentException("no parent Window given to PosSizePropertyPanel::Create", NULL, 0);
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
index a64a579..7b0bbd6 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
@@ -50,9 +50,9 @@ class PosSizePropertyPanel
public:
static PosSizePropertyPanel* Create(
Window* pParent,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings,
- const cssu::Reference<css::ui::XSidebar>& rxSidebar);
+ const css::uno::Reference<css::ui::XSidebar>& rxSidebar);
virtual void DataChanged(
const DataChangedEvent& rEvent) SAL_OVERRIDE;
@@ -121,7 +121,7 @@ private:
::sfx2::sidebar::ControllerItem maAutoHeightControl;
::sfx2::sidebar::ControllerItem m_aMetricCtl;
- cssu::Reference< css::frame::XFrame > mxFrame;
+ css::uno::Reference< css::frame::XFrame > mxFrame;
::sfx2::sidebar::EnumContext maContext;
SfxBindings* mpBindings;
@@ -146,7 +146,7 @@ private:
bool mbAdjustEnabled : 1;
bool mbIsFlip : 1;
- cssu::Reference<css::ui::XSidebar> mxSidebar;
+ css::uno::Reference<css::ui::XSidebar> mxSidebar;
DECL_LINK( ChangePosXHdl, void * );
DECL_LINK( ChangePosYHdl, void * );
@@ -166,9 +166,9 @@ private:
// constructor/destuctor
PosSizePropertyPanel(
Window* pParent,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings,
- const cssu::Reference<css::ui::XSidebar>& rxSidebar);
+ const css::uno::Reference<css::ui::XSidebar>& rxSidebar);
virtual ~PosSizePropertyPanel();
void MetricState( SfxItemState eState, const SfxPoolItem* pState );
diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx b/svx/source/sidebar/text/TextPropertyPanel.cxx
index dbcc1eb..680d739 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.cxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.cxx
@@ -36,7 +36,7 @@
#include <boost/bind.hpp>
using namespace css;
-using namespace cssu;
+using namespace css::uno;
const char UNO_SPACING[] = ".uno:Spacing";
const char UNO_UNDERLINE[] = ".uno:Underline";
@@ -64,7 +64,7 @@ long TextPropertyPanel::GetSelFontSize()
TextPropertyPanel* TextPropertyPanel::Create (
Window* pParent,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings,
const ::sfx2::sidebar::EnumContext& rContext)
{
@@ -83,7 +83,7 @@ TextPropertyPanel* TextPropertyPanel::Create (
}
-TextPropertyPanel::TextPropertyPanel ( Window* pParent, const cssu::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, const ::sfx2::sidebar::EnumContext& /*rContext*/ )
+TextPropertyPanel::TextPropertyPanel ( Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, const ::sfx2::sidebar::EnumContext& /*rContext*/ )
: PanelLayout(pParent, "SidebarTextPanel", "svx/ui/sidebartextpanel.ui", rxFrame),
maFontSizeControl (SID_ATTR_CHAR_FONTHEIGHT, *pBindings, *this, OUString("FontHeight"), rxFrame),
maUnderlineControl (SID_ATTR_CHAR_UNDERLINE, *pBindings, *this, OUString("Underline"), rxFrame),
diff --git a/svx/source/sidebar/text/TextPropertyPanel.hxx b/svx/source/sidebar/text/TextPropertyPanel.hxx
index 9bd78bc..414789d 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.hxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.hxx
@@ -48,7 +48,7 @@ class TextPropertyPanel
public:
static TextPropertyPanel* Create (
Window* pParent,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings,
const ::sfx2::sidebar::EnumContext& rContext);
@@ -99,7 +99,7 @@ private:
TextPropertyPanel (
Window* pParent,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings,
const ::sfx2::sidebar::EnumContext& rContext);
virtual ~TextPropertyPanel (void);
diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.cxx b/sw/source/uibase/sidebar/PagePropertyPanel.cxx
index 4ccf765..f065af2 100644
--- a/sw/source/uibase/sidebar/PagePropertyPanel.cxx
+++ b/sw/source/uibase/sidebar/PagePropertyPanel.cxx
@@ -60,24 +60,24 @@ const char UNO_SIZE[] = ".uno:Size";
const char UNO_COLUMN[] = ".uno:Column";
namespace {
- const cssu::Reference< css::document::XUndoManager > getUndoManager( const cssu::Reference< css::frame::XFrame >& rxFrame )
+ const css::uno::Reference< css::document::XUndoManager > getUndoManager( const css::uno::Reference< css::frame::XFrame >& rxFrame )
{
- const cssu::Reference< css::frame::XController >& xController = rxFrame->getController();
+ const css::uno::Reference< css::frame::XController >& xController = rxFrame->getController();
if ( xController.is() )
{
- const cssu::Reference< css::frame::XModel >& xModel = xController->getModel();
+ const css::uno::Reference< css::frame::XModel >& xModel = xController->getModel();
if ( xModel.is() )
{
- const cssu::Reference< css::document::XUndoManagerSupplier > xSuppUndo( xModel, cssu::UNO_QUERY_THROW );
+ const css::uno::Reference< css::document::XUndoManagerSupplier > xSuppUndo( xModel, css::uno::UNO_QUERY_THROW );
if ( xSuppUndo.is() )
{
- const cssu::Reference< css::document::XUndoManager > xUndoManager( xSuppUndo->getUndoManager(), cssu::UNO_QUERY_THROW );
+ const css::uno::Reference< css::document::XUndoManager > xUndoManager( xSuppUndo->getUndoManager(), css::uno::UNO_QUERY_THROW );
return xUndoManager;
}
}
}
- return cssu::Reference< css::document::XUndoManager > ();
+ return css::uno::Reference< css::document::XUndoManager > ();
}
}
diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.hxx b/sw/source/uibase/sidebar/PagePropertyPanel.hxx
index 4dc697b..876f13e 100644
--- a/sw/source/uibase/sidebar/PagePropertyPanel.hxx
+++ b/sw/source/uibase/sidebar/PagePropertyPanel.hxx
@@ -47,7 +47,6 @@ namespace svx { namespace sidebar {
#include <boost/scoped_ptr.hpp>
-namespace cssu = ::com::sun::star::uno;
namespace sw { namespace sidebar {
@@ -195,7 +194,7 @@ namespace sw { namespace sidebar {
::svx::sidebar::Popup maSizePopup;
::svx::sidebar::Popup maColumnPopup;
- const cssu::Reference< css::document::XUndoManager > mxUndoManager;
+ const css::uno::Reference< css::document::XUndoManager > mxUndoManager;
bool mbInvalidateSIDAttrPageOnSIDAttrPageSizeNotify;
diff --git a/sw/source/uibase/sidebar/SwPanelFactory.cxx b/sw/source/uibase/sidebar/SwPanelFactory.cxx
index 94a6eba..ea2491f 100644
--- a/sw/source/uibase/sidebar/SwPanelFactory.cxx
+++ b/sw/source/uibase/sidebar/SwPanelFactory.cxx
@@ -54,13 +54,13 @@ public:
virtual ~SwPanelFactory(void);
// XUIElementFactory
- cssu::Reference<css::ui::XUIElement> SAL_CALL createUIElement(
+ css::uno::Reference<css::ui::XUIElement> SAL_CALL createUIElement(
const ::rtl::OUString& rsResourceURL,
- const ::cssu::Sequence<css::beans::PropertyValue>& rArguments)
+ const css::uno::Sequence<css::beans::PropertyValue>& rArguments)
throw(
css::container::NoSuchElementException,
css::lang::IllegalArgumentException,
- cssu::RuntimeException, std::exception ) SAL_OVERRIDE;
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
};
SwPanelFactory::SwPanelFactory (void)
@@ -74,7 +74,7 @@ SwPanelFactory::~SwPanelFactory (void)
Reference<ui::XUIElement> SAL_CALL SwPanelFactory::createUIElement (
const ::rtl::OUString& rsResourceURL,
- const ::cssu::Sequence<css::beans::PropertyValue>& rArguments)
+ const css::uno::Sequence<css::beans::PropertyValue>& rArguments)
throw(
container::NoSuchElementException,
lang::IllegalArgumentException,
More information about the Libreoffice-commits
mailing list