long->tools::Long in forms..framework

Change-Id: I4cb29aade5ad1d3c3588b9437197e8493292872e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104625
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

11 files changed, 20 insertions, 18 deletions

diff --git a/framework/inc/uielement/fontsizemenucontroller.hxx b/framework/inc/uielement/fontsizemenucontroller.hxx
index 56796ac8fbbb..a0114155984a 100644
--- a/framework/inc/uielement/fontsizemenucontroller.hxx
+++ b/framework/inc/uielement/fontsizemenucontroller.hxx
@@ -27,6 +27,7 @@
 
 #include <svtools/popupmenucontrollerbase.hxx>
 #include <rtl/ustring.hxx>
+#include <tools/long.hxx>
 
 #include <memory>
 
@@ -56,7 +57,7 @@ namespace framework
 
         private:
             virtual void impl_setPopupMenu() override;
-            void setCurHeight( long nHeight, css::uno::Reference< css::awt::XPopupMenu > const & rPopupMenu );
+            void setCurHeight( tools::Long nHeight, css::uno::Reference< css::awt::XPopupMenu > const & rPopupMenu );
             void fillPopupMenu( css::uno::Reference< css::awt::XPopupMenu > const & rPopupMenu );
             OUString retrievePrinterName( css::uno::Reference< css::frame::XFrame > const & rFrame );
 
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index 2c01e90a47e2..d2df6e582c8f 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -777,7 +777,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::storeToStorage(const css::uno::R
     if (!xStorage.is())
         return;
 
-    long nOpenModes = css::embed::ElementModes::READWRITE;
+    tools::Long nOpenModes = css::embed::ElementModes::READWRITE;
     css::uno::Reference< css::embed::XStorage > xAcceleratorTypeStorage = xStorage->openStorageElement("accelerator", nOpenModes);
     if (!xAcceleratorTypeStorage.is())
         return;
diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx
index 50d402d610d3..46dff460e406 100644
--- a/framework/source/dispatch/oxt_handler.cxx
+++ b/framework/source/dispatch/oxt_handler.cxx
@@ -24,6 +24,7 @@
 #include <com/sun/star/frame/DispatchResultState.hpp>
 #include <com/sun/star/task/XJobExecutor.hpp>
 #include <cppuhelper/supportsservice.hxx>
+#include <tools/long.hxx>
 
 namespace framework{
 
@@ -145,7 +146,7 @@ OUString SAL_CALL Oxt_Handler::detect( css::uno::Sequence< css::beans::PropertyV
     utl::MediaDescriptor aDescriptor( lDescriptor );
     OUString               sURL       = aDescriptor.getUnpackedValueOrDefault( utl::MediaDescriptor::PROP_URL(), OUString() );
 
-    long nLength = sURL.getLength();
+    tools::Long nLength = sURL.getLength();
     if ( ( nLength > 4 ) && sURL.matchIgnoreAsciiCase( ".oxt", nLength-4 ) )
     {
         // "IsSoundFile" differs between different "wav" and "au" file versions...
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 460afbff22e8..72137a98a868 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -2325,7 +2325,7 @@ bool LayoutManager::implts_doLayout( bool bForceRequestBorderSpace, bool bOuterR
             // Position the status bar
             if ( aStatusBarSize.Height() > 0 )
             {
-                implts_setStatusBarPosSize( ::Point( 0, std::max(( aContainerSize.Height() ), long( 0 ))),
+                implts_setStatusBarPosSize( ::Point( 0, std::max(( aContainerSize.Height() ), tools::Long( 0 ))),
                                             ::Size( aContainerSize.Width(),aStatusBarSize.Height() ));
             }
 
@@ -2445,7 +2445,7 @@ void LayoutManager::implts_setDockingAreaWindowSizes()
     // Position the status bar
     if ( aStatusBarSize.Height() > 0 )
     {
-        implts_setStatusBarPosSize( ::Point( 0, std::max(( aContainerClientSize.Height - aStatusBarSize.Height() ), long( 0 ))),
+        implts_setStatusBarPosSize( ::Point( 0, std::max(( aContainerClientSize.Height - aStatusBarSize.Height() ), tools::Long( 0 ))),
                                     ::Size( aContainerClientSize.Width, aStatusBarSize.Height() ));
     }
 }
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 1b07f5a20e32..afafbd1d8830 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -153,7 +153,7 @@ void ToolbarLayoutManager::implts_setDockingAreaWindowSizes( const awt::Rectangl
     awt::DeviceInfo aInfo                = xDevice->getInfo();
     awt::Size       aContainerClientSize( aRectangle.Width - aInfo.LeftInset - aInfo.RightInset  ,
                                           aRectangle.Height - aInfo.TopInset  - aInfo.BottomInset );
-    long aStatusBarHeight                = aDockOffsets.GetHeight();
+    tools::Long aStatusBarHeight                = aDockOffsets.GetHeight();
 
     sal_Int32 nLeftRightDockingAreaHeight( aContainerClientSize.Height );
     if ( rBorderSpace.Y >= 0 )
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index ae3aafef0113..681ce8a4a7ba 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -265,7 +265,7 @@ void ImageManagerImpl::implts_initialize()
     if ( !m_xUserConfigStorage.is() )
         return;
 
-    long nModes = m_bReadOnly ? ElementModes::READ : ElementModes::READWRITE;
+    tools::Long nModes = m_bReadOnly ? ElementModes::READ : ElementModes::READWRITE;
 
     try
     {
@@ -578,7 +578,7 @@ void ImageManagerImpl::initialize( const Sequence< Any >& aArguments )
         uno::Reference< XPropertySet > xPropSet( m_xUserConfigStorage, UNO_QUERY );
         if ( xPropSet.is() )
         {
-            long nOpenMode = 0;
+            tools::Long nOpenMode = 0;
             if ( xPropSet->getPropertyValue("OpenMode") >>= nOpenMode )
                 m_bReadOnly = !( nOpenMode & ElementModes::WRITE );
         }
@@ -1115,7 +1115,7 @@ void ImageManagerImpl::storeToStorage( const uno::Reference< XStorage >& Storage
     if ( !(m_bModified && Storage.is()) )
         return;
 
-    long nModes = ElementModes::READWRITE;
+    tools::Long nModes = ElementModes::READWRITE;
 
     uno::Reference< XStorage > xUserImageStorage = Storage->openStorageElement( IMAGE_FOLDER,
                                                                                 nModes );
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index baa17fb48726..6732eaaf5116 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -879,7 +879,7 @@ ModuleUIConfigurationManager::ModuleUIConfigurationManager(
         Reference< XPropertySet > xPropSet( m_xUserConfigStorage, UNO_QUERY );
         if ( xPropSet.is() )
         {
-            long nOpenMode = 0;
+            tools::Long nOpenMode = 0;
             Any a = xPropSet->getPropertyValue("OpenMode");
             if ( a >>= nOpenMode )
                 m_bReadOnly = !( nOpenMode & ElementModes::WRITE );
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index 9b8a54d50e8c..498279eb40bc 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -626,7 +626,7 @@ void UIConfigurationManager::impl_Initialize()
     // Initialize the top-level structures with the storage data
     if ( m_xDocConfigStorage.is() )
     {
-        long nModes = m_bReadOnly ? ElementModes::READ : ElementModes::READWRITE;
+        tools::Long nModes = m_bReadOnly ? ElementModes::READ : ElementModes::READWRITE;
 
         // Try to access our module sub folder
         for ( sal_Int16 i = 1; i < css::ui::UIElementType::COUNT;
@@ -1192,7 +1192,7 @@ void SAL_CALL UIConfigurationManager::setStorage( const Reference< XStorage >& S
         {
             try
             {
-                long nOpenMode = 0;
+                tools::Long nOpenMode = 0;
                 Any a = xPropSet->getPropertyValue("OpenMode");
                 if ( a >>= nOpenMode )
                     m_bReadOnly = !( nOpenMode & ElementModes::WRITE );
diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx
index 9c746c911ad2..7678c2bfcd25 100644
--- a/framework/source/uielement/fontsizemenucontroller.cxx
+++ b/framework/source/uielement/fontsizemenucontroller.cxx
@@ -103,7 +103,7 @@ OUString FontSizeMenuController::retrievePrinterName( css::uno::Reference< css::
 }
 
 // private function
-void FontSizeMenuController::setCurHeight( long nHeight, Reference< css::awt::XPopupMenu > const & rPopupMenu )
+void FontSizeMenuController::setCurHeight( tools::Long nHeight, Reference< css::awt::XPopupMenu > const & rPopupMenu )
 {
     // check menu item
     sal_uInt16          nChecked    = 0;
@@ -237,7 +237,7 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > co
         pTempAry++;
     }
 
-    setCurHeight( long( m_aFontHeight.Height * 10), rPopupMenu );
+    setCurHeight( tools::Long( m_aFontHeight.Height * 10), rPopupMenu );
 }
 
 // XEventListener
@@ -277,7 +277,7 @@ void SAL_CALL FontSizeMenuController::statusChanged( const FeatureStateEvent& Ev
         if ( m_xPopupMenu.is() )
         {
             SolarMutexGuard aSolarMutexGuard;
-            setCurHeight( long( m_aFontHeight.Height * 10), m_xPopupMenu );
+            setCurHeight( tools::Long( m_aFontHeight.Height * 10), m_xPopupMenu );
         }
     }
 }
diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
index 428558e6daba..d76db7516c88 100644
--- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx
+++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
@@ -442,7 +442,7 @@ OUString SpinfieldToolbarController::FormatOutputString( double fValue )
         if ( m_bFloat )
             snprintf( aBuffer, 128, aFormat.getStr(), fValue );
         else
-            snprintf( aBuffer, 128, aFormat.getStr(), static_cast<long>( fValue ));
+            snprintf( aBuffer, 128, aFormat.getStr(), static_cast<tools::Long>( fValue ));
 
         sal_Int32 nSize = strlen( aBuffer );
         OString aTmp( aBuffer, nSize );
diff --git a/framework/source/uielement/toolbarmodemenucontroller.cxx b/framework/source/uielement/toolbarmodemenucontroller.cxx
index 86dbda38f5b9..a03d31100efa 100644
--- a/framework/source/uielement/toolbarmodemenucontroller.cxx
+++ b/framework/source/uielement/toolbarmodemenucontroller.cxx
@@ -132,7 +132,7 @@ void ToolbarModeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >
     const Sequence<OUString> aModeNodeNames (aModesNode.getNodeNames());
     const sal_Int32 nCount(aModeNodeNames.getLength());
     SvtMiscOptions aMiscOptions;
-    long nCountToolbar = 0;
+    tools::Long nCountToolbar = 0;
 
     for ( sal_Int32 nReadIndex = 0; nReadIndex < nCount; ++nReadIndex )
     {
@@ -142,7 +142,7 @@ void ToolbarModeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >
 
         OUString aLabel = comphelper::getString( aModeNode.getNodeValue( "Label" ) );
         OUString aCommandArg = comphelper::getString( aModeNode.getNodeValue( "CommandArg" ) );
-        long nPosition = comphelper::getINT32( aModeNode.getNodeValue( "MenuPosition" ) );
+        tools::Long nPosition = comphelper::getINT32( aModeNode.getNodeValue( "MenuPosition" ) );
         bool isExperimental = comphelper::getBOOL( aModeNode.getNodeValue( "IsExperimental" ) );
         bool hasNotebookbar = comphelper::getBOOL( aModeNode.getNodeValue( "HasNotebookbar" ) );