summaryrefslogtreecommitdiff
path: root/include/svx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-10-23 12:06:00 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-10-24 14:43:34 +0200
commit6f50961e69406a17d6ec998956a6b33208b1001b (patch)
tree413c83df969e73c5cba1e11ef3740afc748ee1f5 /include/svx
parent4e729de73f2947155248f8df5897380611b87917 (diff)
remove more rtl::OUString and OString prefixes
which seem to have snuck back in since the great rounds of removals. Change-Id: I85f7f5f4801c0b48dae8b50f51f83595b286d6a1 Reviewed-on: https://gerrit.libreoffice.org/62229 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/svx')
-rw-r--r--include/svx/galleryitem.hxx6
-rw-r--r--include/svx/nbdtmg.hxx10
-rw-r--r--include/svx/sidebar/ContextChangeEventMultiplexer.hxx2
-rw-r--r--include/svx/sidebar/SelectionChangeHandler.hxx4
-rw-r--r--include/svx/textchain.hxx2
5 files changed, 12 insertions, 12 deletions
diff --git a/include/svx/galleryitem.hxx b/include/svx/galleryitem.hxx
index e3d9cc80c9c2..1a9ac4f617c3 100644
--- a/include/svx/galleryitem.hxx
+++ b/include/svx/galleryitem.hxx
@@ -39,8 +39,8 @@
class SVX_DLLPUBLIC SvxGalleryItem : public SfxPoolItem
{
sal_Int8 m_nType;
- rtl::OUString m_aURL;
- rtl::OUString m_aFilterName;
+ OUString m_aURL;
+ OUString m_aFilterName;
css::uno::Reference< css::lang::XComponent > m_xDrawing;
css::uno::Reference< css::graphic::XGraphic > m_xGraphic;
@@ -52,7 +52,7 @@ public:
virtual ~SvxGalleryItem() override;
sal_Int8 GetType() const { return m_nType; }
- const rtl::OUString& GetURL() const { return m_aURL; }
+ const OUString& GetURL() const { return m_aURL; }
const css::uno::Reference< css::graphic::XGraphic >& GetGraphic() const { return m_xGraphic; }
// pure virtual methods from SfxPoolItem
diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index 030b692ec8c3..9379d1da9282 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -50,10 +50,10 @@ class SVX_DLLPUBLIC NumSettings_Impl
SvxAdjust eNumAlign;
long nNumAlignAt;
long nNumIndentAt;
- rtl::OUString sPrefix;
- rtl::OUString sSuffix;
- rtl::OUString sBulletChar;
- rtl::OUString sBulletFont;
+ OUString sPrefix;
+ OUString sSuffix;
+ OUString sBulletChar;
+ OUString sBulletFont;
SvxBrushItem *pBrushItem;
Size aSize;
@@ -103,7 +103,7 @@ class SVX_DLLPUBLIC OutlineSettings_Impl
{
public:
bool bIsCustomized;
- rtl::OUString sDescription;
+ OUString sDescription;
NumSettingsArr_Impl *pNumSettingsArr;
public:
OutlineSettings_Impl() :
diff --git a/include/svx/sidebar/ContextChangeEventMultiplexer.hxx b/include/svx/sidebar/ContextChangeEventMultiplexer.hxx
index 9b94e9067faa..5b315aa3a928 100644
--- a/include/svx/sidebar/ContextChangeEventMultiplexer.hxx
+++ b/include/svx/sidebar/ContextChangeEventMultiplexer.hxx
@@ -56,7 +56,7 @@ public:
const vcl::EnumContext::Context eContext);
private:
- static ::rtl::OUString GetModuleName (
+ static OUString GetModuleName (
const css::uno::Reference<css::frame::XFrame>& rxFrame);
};
diff --git a/include/svx/sidebar/SelectionChangeHandler.hxx b/include/svx/sidebar/SelectionChangeHandler.hxx
index deaa2581a9a2..45dce18525b9 100644
--- a/include/svx/sidebar/SelectionChangeHandler.hxx
+++ b/include/svx/sidebar/SelectionChangeHandler.hxx
@@ -45,7 +45,7 @@ class SVX_DLLPUBLIC SelectionChangeHandler
{
public:
SelectionChangeHandler (
- const std::function<rtl::OUString ()>& rSelectionChangeCallback,
+ const std::function<OUString ()>& rSelectionChangeCallback,
const css::uno::Reference<css::frame::XController>& rxController,
const vcl::EnumContext::Context eDefaultContext);
virtual ~SelectionChangeHandler() override;
@@ -63,7 +63,7 @@ private:
SelectionChangeHandler(const SelectionChangeHandler&) = delete;
SelectionChangeHandler& operator=(const SelectionChangeHandler&) = delete;
- const std::function<rtl::OUString ()> maSelectionChangeCallback;
+ const std::function<OUString ()> maSelectionChangeCallback;
css::uno::Reference<css::frame::XController> mxController;
const vcl::EnumContext::Context meDefaultContext;
bool mbIsConnected;
diff --git a/include/svx/textchain.hxx b/include/svx/textchain.hxx
index 8c0c6a3b59e6..f270754c2df5 100644
--- a/include/svx/textchain.hxx
+++ b/include/svx/textchain.hxx
@@ -78,7 +78,7 @@ namespace rtl {
class OUString;
}
-typedef rtl::OUString ChainLinkId;
+typedef OUString ChainLinkId;
enum class CursorChainingEvent
{