long->sal_uInt16 in SvxShape

Change-Id: I28a54497b1a4c236d9d3bdb0f44d3e46f3e55de7
Reviewed-on: https://gerrit.libreoffice.org/46810
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

3 files changed, 8 insertions, 8 deletions

diff --git a/include/svx/DescriptionGenerator.hxx b/include/svx/DescriptionGenerator.hxx
index ecbe8cc51093..fd1b1e2a39ad 100644
--- a/include/svx/DescriptionGenerator.hxx
+++ b/include/svx/DescriptionGenerator.hxx
@@ -101,7 +101,7 @@ public:
     void AddProperty (const OUString& sPropertyName,
         PropertyType aType,
         const OUString& sLocalizedName=OUString(),
-        long nWhichId=-1);
+        sal_uInt16 nWhichId = 0xffff);
 
     /** Add the given property name and its associated value to the
         description string.  If the property value does not differ from the
@@ -123,7 +123,7 @@ public:
     void AddProperty (const OUString& sPropertyName,
         PropertyType aType,
         const char* pResourceId,
-        long nWhichId=-1);
+        sal_uInt16 nWhichId = 0xffff);
 
     /** Append the given string as is to the current description.
         @param sString
@@ -178,7 +178,7 @@ private:
             Name of the property.
     */
     SVX_DLLPRIVATE void AddString (const OUString& sPropertyName,
-        const OUString& sLocalizedName, long nWhichId);
+        const OUString& sLocalizedName, sal_uInt16 nWhichId);
 
     /** Add a property value formatted as fill style to the description
         string.  If the fill style is <const>HATCH</const>,
diff --git a/include/svx/unoapi.hxx b/include/svx/unoapi.hxx
index a2df06bf2341..8000220b2940 100644
--- a/include/svx/unoapi.hxx
+++ b/include/svx/unoapi.hxx
@@ -80,7 +80,7 @@ SVX_DLLPUBLIC bool SvxFieldUnitToMeasureUnit( const FieldUnit nVcl, short& eApi
  * @throws std::exception
 */
 SVX_DLLPUBLIC SAL_WARN_UNUSED_RESULT OUString
-    SvxUnogetApiNameForItem(const sal_Int16 nWhich, const OUString& rInternalName);
+    SvxUnogetApiNameForItem(const sal_uInt16 nWhich, const OUString& rInternalName);
 
 /**
  * If the given name is a predefined API name it is replaced by the predefined name
@@ -89,7 +89,7 @@ SVX_DLLPUBLIC SAL_WARN_UNUSED_RESULT OUString
  * @throws std::exception
 */
 SVX_DLLPUBLIC SAL_WARN_UNUSED_RESULT OUString
-    SvxUnogetInternalNameForItem(const sal_Int16 nWhich, const OUString& rApiName);
+    SvxUnogetInternalNameForItem(const sal_uInt16 nWhich, const OUString& rApiName);
 
 #endif // INCLUDED_SVX_UNOAPI_HXX
 
diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx
index ba28d311dd5d..678ee0abeffc 100644
--- a/include/svx/unoshape.hxx
+++ b/include/svx/unoshape.hxx
@@ -148,7 +148,7 @@ protected:
 
     css::uno::Any GetAnyForItem( SfxItemSet const & aSet, const SfxItemPropertySimpleEntry* pMap ) const;
 
-    bool SetFillAttribute( sal_Int32 nWID, const OUString& rName );
+    bool SetFillAttribute( sal_uInt16 nWID, const OUString& rName );
 
     /** called from the XActionLockable interface methods on initial locking */
     virtual void lock();
@@ -216,8 +216,8 @@ public:
     sal_uInt32 getShapeKind() const;
 
     // styles need this
-    static bool SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet, SdrModel const * pModel );
-    static bool SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet );
+    static bool SetFillAttribute( sal_uInt16 nWID, const OUString& rName, SfxItemSet& rSet, SdrModel const * pModel );
+    static bool SetFillAttribute( sal_uInt16 nWID, const OUString& rName, SfxItemSet& rSet );
 
     /** same as SetFillAttribute but for property names instead of which ids,
         and the property found is returned instead of set at the object