diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-02-26 20:01:38 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-02-26 20:01:38 +0100 |
| commit | 8828d57dc72514deef8e0df8c4e7f2e90cdce018 (patch) | |
| tree | 2e31656ed80bdd9a7740ed732f3428cc9d5a0b80 | |
| parent | f3e44e417ca3d5e85287860325f06069ec7654db (diff) | |
Clean up use of integer types
Change-Id: I99b9094524ec00231a3471a5373bd164d61bb2da
| -rw-r--r-- | svx/source/form/fmshimp.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 42dfa92c62ce..892b3e2aef4f 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -311,14 +311,14 @@ namespace } - sal_Int16 GridView2ModelPos(const Reference< XIndexAccess>& rColumns, sal_Int16 nViewPos) + sal_Int32 GridView2ModelPos(const Reference< XIndexAccess>& rColumns, sal_Int16 nViewPos) { try { if (rColumns.is()) { // loop through all columns - sal_Int16 i; + sal_Int32 i; Reference< XPropertySet> xCur; for (i=0; i<rColumns->getCount(); ++i) { @@ -341,7 +341,7 @@ namespace { DBG_UNHANDLED_EXCEPTION(); } - return (sal_Int16)-1; + return -1; } @@ -1518,7 +1518,7 @@ void FmXFormShell::ExecuteSearch() xColumns.set(xGridPeer->getColumns(),UNO_QUERY); sal_Int16 nViewCol = xGrid->getCurrentColumnPosition(); - sal_Int16 nModelCol = GridView2ModelPos(xColumns, nViewCol); + sal_Int32 nModelCol = GridView2ModelPos(xColumns, nViewCol); Reference< XPropertySet> xCurrentCol; if(xColumns.is()) xColumns->getByIndex(nModelCol) >>= xCurrentCol; @@ -2394,7 +2394,7 @@ IMPL_LINK(FmXFormShell, OnSearchContextRequest, FmSearchContext&, rfmscContextIn if (!IsSearchableControl(xCurrentColumn)) continue; - sal_Int16 nModelPos = GridView2ModelPos(xModelColumns, nViewPos); + sal_Int32 nModelPos = GridView2ModelPos(xModelColumns, nViewPos); Reference< XPropertySet> xCurrentColModel; xModelColumns->getByIndex(nModelPos) >>= xCurrentColModel; aName = ::comphelper::getString(xCurrentColModel->getPropertyValue(FM_PROP_CONTROLSOURCE)); |