summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorStefan Weiberg <stefan.weiberg@germandev.org>2014-09-02 17:38:00 +0000
committerThomas Arnhold <thomas@arnhold.org>2014-09-03 02:03:34 -0500
commit9fba10b5a5f1e56dde0cdc4859622fb40db1c13a (patch)
treeab5ec25b9ac4dd28b931af9677f6a3c7f72bc6d8 /sc
parent81300228a4af0ad3988f5bfe670fd8c38ea07bf4 (diff)
Related fdo#82088: removing another bunch of alias
Change-Id: I6e2ab6d20723803aedb530b4d25aa79ec0edbb8f Reviewed-on: https://gerrit.libreoffice.org/11260 Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'sc')
-rw-r--r--sc/source/ui/sidebar/AlignmentPropertyPanel.cxx6
-rw-r--r--sc/source/ui/sidebar/AlignmentPropertyPanel.hxx6
-rw-r--r--sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx6
-rw-r--r--sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx6
-rw-r--r--sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx6
-rw-r--r--sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx6
-rw-r--r--sc/source/ui/sidebar/ScPanelFactory.cxx12
7 files changed, 24 insertions, 24 deletions
diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
index 8c612976c80b..649fdf4a5e08 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 c67e17f047e5..1f0649c276cf 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 2a1a3374881f..a16668c3ca40 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 4224e39f683b..6538a70c5b3c 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 724413f91414..3a162f9434de 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 4a0dc7ca7437..3c34b375694b 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 04b0bb97bb91..cd0e946ae389 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,