chart52: merge with DEV300_m100

1 files changed, 4 insertions, 4 deletions

diff --git a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx
index cf2bd36ebc33..51491c29f98a 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx
@@ -48,16 +48,16 @@ namespace dbaui
     {
     protected:
         OSelectionBrowseBox*    pOwner;
-        USHORT                  m_nColumnPostion;
+        sal_uInt16                  m_nColumnPostion;
 
         virtual void    Undo() = 0;
         virtual void    Redo() = 0;
 
     public:
-        OQueryDesignFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, USHORT nCommentID);
+        OQueryDesignFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, sal_uInt16 nCommentID);
         virtual ~OQueryDesignFieldUndoAct();
 
-        inline void SetColumnPosition(USHORT _nColumnPostion)
+        inline void SetColumnPosition(sal_uInt16 _nColumnPostion)
         {
             m_nColumnPostion = _nColumnPostion;
             OSL_ENSURE(m_nColumnPostion != BROWSER_INVALIDID,"Column position was not set add the undo action!");
@@ -112,7 +112,7 @@ namespace dbaui
         OTableFieldDescRef      pDescr;     // geloeschte Spaltenbeschreibung
 
     public:
-        OTabFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, USHORT nCommentID) : OQueryDesignFieldUndoAct(pSelBrwBox, nCommentID) { }
+        OTabFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, sal_uInt16 nCommentID) : OQueryDesignFieldUndoAct(pSelBrwBox, nCommentID) { }
 
         void SetTabFieldDescr(OTableFieldDescRef pDescription) { pDescr = pDescription; }
     };