summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-02-16 13:45:37 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-02-17 07:52:09 +0200
commitf1421a3e12167fafc966d069b3a4f7eb84ffda05 (patch)
tree478c783517a88afdcc238fe95eda06e57fa61a3f /include
parentfb4bf693999b8a1ebf79bad0d223ae2d4398cf81 (diff)
convert SbxNameType to scoped enum
and drop unused enumerators Change-Id: I2b47828b2146fcda335f1dc1c1f61a1139abbe19
Diffstat (limited to 'include')
-rw-r--r--include/basic/sbxdef.hxx8
-rw-r--r--include/basic/sbxvar.hxx2
2 files changed, 4 insertions, 6 deletions
diff --git a/include/basic/sbxdef.hxx b/include/basic/sbxdef.hxx
index 44c75dbb03b6..77e3231a65a5 100644
--- a/include/basic/sbxdef.hxx
+++ b/include/basic/sbxdef.hxx
@@ -119,11 +119,9 @@ enum SbxOperator {
SbxGE // this >= var
};
-enum SbxNameType { // Type of the questioned name of a variable
- SbxNAME_NONE, // plain name
- SbxNAME_SHORT, // Name(A,B)
- SbxNAME_SHORT_TYPES, // Name%(A%,B$)
- SbxNAME_LONG_TYPES // Name(A As Integer, B As String) As Integer
+enum class SbxNameType { // Type of the questioned name of a variable
+ NONE, // plain name
+ ShortTypes, // Name%(A%,B$)
};
// from 1996/3/20: New error messages
diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx
index 82acb60f2982..4855e0973350 100644
--- a/include/basic/sbxvar.hxx
+++ b/include/basic/sbxvar.hxx
@@ -249,7 +249,7 @@ public:
void Dump( SvStream&, bool bDumpAll );
void SetName( const OUString& );
- const OUString& GetName( SbxNameType = SbxNAME_NONE ) const;
+ const OUString& GetName( SbxNameType = SbxNameType::NONE ) const;
sal_uInt16 GetHashCode() const { return nHash; }
virtual void SetModified( bool ) override;