summaryrefslogtreecommitdiff
path: root/cui/source/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-08-24 15:06:35 +0200
committerNoel Grandin <noel@peralex.com>2016-08-25 08:40:00 +0200
commit3aa7db4586c53a0815b74cc514ff8a6541dc7e01 (patch)
treeb3dba2d12d3ef9738239c814184211fe75afa505 /cui/source/inc
parentce51b64947f120c592853aec2d01542dcd2cc2c0 (diff)
convert SvxAnchorIds to scoped enum
Change-Id: I4375fa07eb6ac81b21b904e965e4c2f9600ca99a
Diffstat (limited to 'cui/source/inc')
-rw-r--r--cui/source/inc/labdlg.hxx5
-rw-r--r--cui/source/inc/swpossizetabpage.hxx3
-rw-r--r--cui/source/inc/transfrm.hxx13
3 files changed, 8 insertions, 13 deletions
diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx
index a7b10648b434..e431abb0065f 100644
--- a/cui/source/inc/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
@@ -26,6 +26,7 @@
#include <sfx2/tabdlg.hxx>
#include <svx/sxctitm.hxx>
#include <svx/sxcecitm.hxx>
+#include <svx/anchorid.hxx>
class SdrView;
@@ -101,7 +102,7 @@ class SvxCaptionTabDialog : public SfxTabDialog
{
private:
const SdrView* pView;
- sal_uInt16 nAnchorCtrls;
+ SvxAnchorIds nAnchorCtrls;
sal_uInt16 m_nSwPosSizePageId;
sal_uInt16 m_nPositionSizePageId;
sal_uInt16 m_nCaptionPageId;
@@ -112,7 +113,7 @@ private:
public:
SvxCaptionTabDialog(vcl::Window* pParent, const SdrView* pView,
- sal_uInt16 nAnchorTypes = 0);
+ SvxAnchorIds nAnchorTypes = SvxAnchorIds::NONE);
/// link for the Writer to validate positions
void SetValidateFramePosLink( const Link<SvxSwFrameValidation&,void>& rLink );
diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx
index 611ebc01003d..5142d6dfaeaf 100644
--- a/cui/source/inc/swpossizetabpage.hxx
+++ b/cui/source/inc/swpossizetabpage.hxx
@@ -31,6 +31,7 @@
struct FrmMap;
class SdrView;
struct SvxSwFrameValidation;
+enum class SvxAnchorIds;
class SvxSwPosSizeTabPage : public SfxTabPage
{
@@ -136,7 +137,7 @@ public:
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
- void EnableAnchorTypes(sal_uInt16 nAnchorEnable);
+ void EnableAnchorTypes(SvxAnchorIds nAnchorEnable);
void SetValidateFramePosLink( const Link<SvxSwFrameValidation&,void>& rLink )
{m_aValidateLink = rLink;}
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index 2857e451cc76..7e9077758e54 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -21,6 +21,7 @@
#include <svx/dlgctrl.hxx>
#include <svx/dialcontrol.hxx>
+#include <svx/anchorid.hxx>
#include <vcl/fixed.hxx>
@@ -35,14 +36,6 @@ class SdrView;
|*
\************************************************************************/
-/** put this into the nAnchorTypes parameter of the SvxTransformTabDialog c'tor
- to disable the size controls */
-const sal_uInt16 SVX_OBJ_NORESIZE = 0x0100;
-
-/** put this into the nAnchorTypes parameter of the SvxTransformTabDialog c'tor
- to disable the protect controls */
-const sal_uInt16 SVX_OBJ_NOPROTECT = 0x0200;
-
struct SvxSwFrameValidation;
class SvxTransformTabDialog : public SfxTabDialog
{
@@ -53,7 +46,7 @@ class SvxTransformTabDialog : public SfxTabDialog
private:
const SdrView* pView;
- sal_uInt16 nAnchorCtrls;
+ SvxAnchorIds nAnchorCtrls;
Link<SvxSwFrameValidation&,void> aValidateLink;
virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override;
@@ -62,7 +55,7 @@ public:
SvxTransformTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr,
const SdrView* pView,
- sal_uInt16 nAnchorTypes = 0);
+ SvxAnchorIds nAnchorTypes = SvxAnchorIds::NONE);
//link for the Writer to validate positions
void SetValidateFramePosLink( const Link<SvxSwFrameValidation&,void>& rLink );