diff options
18 files changed, 54 insertions, 51 deletions
diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx index 9bd74f9f4792..3e79596bb07f 100644 --- a/forms/source/component/imgprod.cxx +++ b/forms/source/component/imgprod.cxx @@ -365,14 +365,14 @@ void ImageProducer::ImplUpdateConsumer( const Graphic& rGraphic ) Bitmap aMask( aBmpEx.GetMask() ); BitmapReadAccess* pMskAcc = !!aMask ? aMask.AcquireReadAccess() : nullptr; - const long nWidth = pBmpAcc->Width(); - const long nHeight = pBmpAcc->Height(); - const long nStartX = 0; - const long nEndX = nWidth - 1; - const long nStartY = 0; - const long nEndY = nHeight - 1; - const long nPartWidth = nEndX - nStartX + 1; - const long nPartHeight = nEndY - nStartY + 1; + const tools::Long nWidth = pBmpAcc->Width(); + const tools::Long nHeight = pBmpAcc->Height(); + const tools::Long nStartX = 0; + const tools::Long nEndX = nWidth - 1; + const tools::Long nStartY = 0; + const tools::Long nEndY = nHeight - 1; + const tools::Long nPartWidth = nEndX - nStartX + 1; + const tools::Long nPartHeight = nEndY - nStartY + 1; if( !pMskAcc ) { @@ -393,11 +393,11 @@ void ImageProducer::ImplUpdateConsumer( const Graphic& rGraphic ) css::uno::Sequence<sal_Int8> aData( nPartWidth * nPartHeight ); sal_Int8* pTmp = aData.getArray(); - for( long nY = nStartY; nY <= nEndY; nY++ ) + for( tools::Long nY = nStartY; nY <= nEndY; nY++ ) { Scanline pScanlineMask = pMskAcc->GetScanline( nY ); Scanline pScanline = pBmpAcc->GetScanline( nY ); - for( long nX = nStartX; nX <= nEndX; nX++ ) + for( tools::Long nX = nStartX; nX <= nEndX; nX++ ) { if( pMskAcc->GetPixelFromData( pScanlineMask, nX ) == aWhite ) *pTmp++ = sal::static_int_cast< sal_Int8 >( @@ -416,11 +416,11 @@ void ImageProducer::ImplUpdateConsumer( const Graphic& rGraphic ) css::uno::Sequence<sal_Int32> aData( nPartWidth * nPartHeight ); sal_Int32* pTmp = aData.getArray(); - for( long nY = nStartY; nY <= nEndY; nY++ ) + for( tools::Long nY = nStartY; nY <= nEndY; nY++ ) { Scanline pScanlineMask = pMskAcc->GetScanline( nY ); Scanline pScanline = pBmpAcc->GetScanline( nY ); - for( long nX = nStartX; nX <= nEndX; nX++ ) + for( tools::Long nX = nStartX; nX <= nEndX; nX++ ) { if( pMskAcc->GetPixelFromData( pScanlineMask, nX ) == aWhite ) *pTmp++ = mnTransIndex; @@ -440,11 +440,11 @@ void ImageProducer::ImplUpdateConsumer( const Graphic& rGraphic ) const BitmapColor aWhite( pMskAcc->GetBestMatchingColor( COL_WHITE ) ); sal_Int32* pTmp = aData.getArray(); - for( long nY = nStartY; nY <= nEndY; nY++ ) + for( tools::Long nY = nStartY; nY <= nEndY; nY++ ) { Scanline pScanlineMask = pMskAcc->GetScanline( nY ); Scanline pScanline = pBmpAcc->GetScanline( nY ); - for( long nX = nStartX; nX <= nEndX; nX++, pTmp++ ) + for( tools::Long nX = nStartX; nX <= nEndX; nX++, pTmp++ ) { const BitmapColor aCol( pBmpAcc->GetPixelFromData( pScanline, nX ) ); diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx index 0634c57f9661..36c28323bd94 100644 --- a/forms/source/richtext/richtextimplcontrol.cxx +++ b/forms/source/richtext/richtextimplcontrol.cxx @@ -390,8 +390,8 @@ namespace frm const StyleSettings& rStyleSettings = m_pAntiImpl->GetSettings().GetStyleSettings(); - long nScrollBarWidth = m_pVScroll ? rStyleSettings.GetScrollBarSize() : 0; - long nScrollBarHeight = m_pHScroll ? rStyleSettings.GetScrollBarSize() : 0; + tools::Long nScrollBarWidth = m_pVScroll ? rStyleSettings.GetScrollBarSize() : 0; + tools::Long nScrollBarHeight = m_pHScroll ? rStyleSettings.GetScrollBarSize() : 0; if ( m_pAntiImpl->IsZoom() ) { @@ -405,11 +405,11 @@ namespace frm // the size of the viewport - note that the viewport does *not* occupy all the place // which is left when subtracting the scrollbar width/height Size aViewportPlaygroundPixel( aPlaygroundSizePixel ); - aViewportPlaygroundPixel.setWidth( ::std::max( long( 10 ), long( aViewportPlaygroundPixel.Width() - nScrollBarWidth ) ) ); - aViewportPlaygroundPixel.setHeight( ::std::max( long( 10 ), long( aViewportPlaygroundPixel.Height() - nScrollBarHeight ) ) ); + aViewportPlaygroundPixel.setWidth( ::std::max( tools::Long( 10 ), tools::Long( aViewportPlaygroundPixel.Width() - nScrollBarWidth ) ) ); + aViewportPlaygroundPixel.setHeight( ::std::max( tools::Long( 10 ), tools::Long( aViewportPlaygroundPixel.Height() - nScrollBarHeight ) ) ); Size aViewportPlaygroundLogic( m_pViewport->PixelToLogic( aViewportPlaygroundPixel ) ); - const long nOffset = 2; + const tools::Long nOffset = 2; Size aViewportSizePixel( aViewportPlaygroundPixel.Width() - 2 * nOffset, aViewportPlaygroundPixel.Height() - 2 * nOffset ); Size aViewportSizeLogic( m_pViewport->PixelToLogic( aViewportSizePixel ) ); @@ -436,7 +436,7 @@ namespace frm m_pVScroll->SetVisibleSize( aViewportPlaygroundLogic.Height() ); // the default height of a text line... - long nFontHeight = m_pEngine->GetStandardFont(0).GetFontSize().Height(); + tools::Long nFontHeight = m_pEngine->GetStandardFont(0).GetFontSize().Height(); // ... is the scroll size for the vertical scrollbar m_pVScroll->SetLineSize( nFontHeight ); // the viewport width, minus one line, is the page scroll size @@ -448,7 +448,7 @@ namespace frm { m_pHScroll->SetVisibleSize( aViewportPlaygroundLogic.Width() ); - long nFontWidth = m_pEngine->GetStandardFont(0).GetFontSize().Width(); + tools::Long nFontWidth = m_pEngine->GetStandardFont(0).GetFontSize().Width(); if ( !nFontWidth ) { m_pViewport->Push( PushFlags::FONT ); @@ -471,7 +471,7 @@ namespace frm { if ( m_pVScroll ) { - long nOverallTextHeight = m_pEngine->GetTextHeight(); + tools::Long nOverallTextHeight = m_pEngine->GetTextHeight(); m_pVScroll->SetRange( Range( 0, nOverallTextHeight ) ); m_pVScroll->SetThumbPos( m_pView->GetVisArea().Top() ); } @@ -479,7 +479,7 @@ namespace frm if ( m_pHScroll ) { Size aPaperSize( m_pEngine->GetPaperSize() ); - long nOverallTextWidth = ( aPaperSize.Width() == EMPTY_PAPER_SIZE ) ? m_pEngine->CalcTextWidth() : aPaperSize.Width(); + tools::Long nOverallTextWidth = ( aPaperSize.Width() == EMPTY_PAPER_SIZE ) ? m_pEngine->CalcTextWidth() : aPaperSize.Width(); m_pHScroll->SetRange( Range( 0, nOverallTextWidth ) ); m_pHScroll->SetThumbPos( m_pView->GetVisArea().Left() ); } @@ -539,7 +539,7 @@ namespace frm namespace { - void lcl_inflate( tools::Rectangle& _rRect, long _nInflateX, long _nInflateY ) + void lcl_inflate( tools::Rectangle& _rRect, tools::Long _nInflateX, tools::Long _nInflateY ) { _rRect.AdjustLeft( -_nInflateX ); _rRect.AdjustRight(_nInflateX ); diff --git a/forms/source/runtime/formoperations.hxx b/forms/source/runtime/formoperations.hxx index fcac2220608d..86c44feff3f2 100644 --- a/forms/source/runtime/formoperations.hxx +++ b/forms/source/runtime/formoperations.hxx @@ -35,6 +35,7 @@ #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> #include <connectivity/dbtools.hxx> +#include <tools/long.hxx> namespace frm { @@ -70,7 +71,7 @@ namespace frm bool m_bActiveControlModified; bool m_bConstructed; #ifdef DBG_UTIL - mutable long + mutable tools::Long m_nMethodNestingLevel; #endif diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 71404a0f3dbf..456d29e2de38 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -71,7 +71,7 @@ public: void ClearAllParas(); void MakeTree(StructPage* _pTree, weld::TreeIter* pParent, const FormulaToken* pFuncToken, - const FormulaToken* _pToken, long Count); + const FormulaToken* _pToken, tools::Long Count); void fillTree(StructPage* _pTree); void UpdateTokenArray( const OUString& rStrExp); OUString RepairFormula(const OUString& aFormula); @@ -583,12 +583,12 @@ void FormulaDlg_Impl::CalcStruct( const OUString& rStrExp, bool bForceRecalcStru } void FormulaDlg_Impl::MakeTree(StructPage* _pTree, weld::TreeIter* pParent, const FormulaToken* pFuncToken, - const FormulaToken* _pToken, long Count) + const FormulaToken* _pToken, tools::Long Count) { if ( _pToken == nullptr || Count <= 0 ) return; - long nParas = _pToken->GetParamCount(); + tools::Long nParas = _pToken->GetParamCount(); OpCode eOp = _pToken->GetOpCode(); // #i101512# for output, the original token is needed diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx index 2cfc7deccec6..68d1ec3b4fc4 100644 --- a/formula/source/ui/dlg/funcutl.cxx +++ b/formula/source/ui/dlg/funcutl.cxx @@ -76,7 +76,7 @@ bool ArgEdit::KeyInput(const KeyEvent& rKEvt) if ( !pEdNext ) { nThumb++; - bDoScroll = ( nThumb+3 < static_cast<long>(nArgs) ); + bDoScroll = ( nThumb+3 < static_cast<tools::Long>(nArgs) ); } else { diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx index 454af53891fe..35a925a10848 100644 --- a/formula/source/ui/dlg/parawin.cxx +++ b/formula/source/ui/dlg/parawin.cxx @@ -236,9 +236,9 @@ void ParaWin::SetActiveLine(sal_uInt16 no) if (no >= nMaxArgs) return; - long nOffset = GetSliderPos(); + tools::Long nOffset = GetSliderPos(); nActiveLine=no; - long nNewEdPos=static_cast<long>(nActiveLine)-nOffset; + tools::Long nNewEdPos=static_cast<tools::Long>(nActiveLine)-nOffset; if(nNewEdPos<0 || nNewEdPos>3) { nOffset+=nNewEdPos; diff --git a/fpicker/source/office/fileview.cxx b/fpicker/source/office/fileview.cxx index 0c24a2380915..49934cc1a028 100644 --- a/fpicker/source/office/fileview.cxx +++ b/fpicker/source/office/fileview.cxx @@ -379,8 +379,8 @@ namespace double fSize( static_cast<double>(nSize) ); int nDec; - long nMega = 1024 * 1024; - long nGiga = nMega * 1024; + tools::Long nMega = 1024 * 1024; + tools::Long nGiga = nMega * 1024; OUString aUnitStr(' '); 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" ) ); |