summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--framework/inc/classes/fwktabwindow.hxx2
-rw-r--r--framework/source/classes/droptargetlistener.cxx2
-rw-r--r--framework/source/classes/fwktabwindow.cxx2
-rw-r--r--framework/source/helper/persistentwindowstate.cxx2
-rw-r--r--framework/source/inc/pattern/window.hxx2
-rw-r--r--framework/source/services/autorecovery.cxx2
-rw-r--r--framework/source/services/backingwindow.cxx2
-rw-r--r--framework/source/services/license.cxx6
-rw-r--r--framework/source/services/tabwindowservice.cxx10
-rw-r--r--framework/source/uielement/addonstoolbarwrapper.cxx2
-rw-r--r--framework/source/uielement/fontsizemenucontroller.cxx4
-rw-r--r--framework/source/uielement/statusbarwrapper.cxx2
-rw-r--r--framework/source/uielement/toolbarwrapper.cxx2
13 files changed, 20 insertions, 20 deletions
diff --git a/framework/inc/classes/fwktabwindow.hxx b/framework/inc/classes/fwktabwindow.hxx
index bef0f606f993..7d01b3c6f9d8 100644
--- a/framework/inc/classes/fwktabwindow.hxx
+++ b/framework/inc/classes/fwktabwindow.hxx
@@ -54,7 +54,7 @@ class FwkTabControl : public TabControl
public:
FwkTabControl( Window* pParent, const ResId& rResId );
- void BroadcastEvent( sal_uIntPtr nEvent );
+ void BroadcastEvent( sal_uLong nEvent );
};
class FwkTabPage : public TabPage
diff --git a/framework/source/classes/droptargetlistener.cxx b/framework/source/classes/droptargetlistener.cxx
index 4906c8ff6677..d3aad90c5c0d 100644
--- a/framework/source/classes/droptargetlistener.cxx
+++ b/framework/source/classes/droptargetlistener.cxx
@@ -107,7 +107,7 @@ void SAL_CALL DropTargetListener::drop( const css::datatransfer::dnd::DropTarget
// at first check filelist format
if ( aHelper.GetFileList( SOT_FORMAT_FILE_LIST, aFileList ) )
{
- sal_uIntPtr i, nCount = aFileList.Count();
+ sal_uLong i, nCount = aFileList.Count();
for ( i = 0; i < nCount; ++i )
implts_OpenFile( aFileList.GetFile(i) );
bFormatFound = sal_True;
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx
index 58a2b1a00aa3..d7868a3a0857 100644
--- a/framework/source/classes/fwktabwindow.cxx
+++ b/framework/source/classes/fwktabwindow.cxx
@@ -70,7 +70,7 @@ FwkTabControl::FwkTabControl( Window* pParent, const ResId& rResId ) :
// -----------------------------------------------------------------------
-void FwkTabControl::BroadcastEvent( sal_uIntPtr nEvent )
+void FwkTabControl::BroadcastEvent( sal_uLong nEvent )
{
if ( VCLEVENT_TABPAGE_ACTIVATE == nEvent || VCLEVENT_TABPAGE_DEACTIVATE == nEvent )
ImplCallEventListeners( nEvent, (void*)(sal_uIntPtr)GetCurPageId() );
diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx
index d3c9dd4f0ea1..877c2dd3d711 100644
--- a/framework/source/helper/persistentwindowstate.cxx
+++ b/framework/source/helper/persistentwindowstate.cxx
@@ -297,7 +297,7 @@ void PersistentWindowState::implst_setWindowStateOnConfig(const css::uno::Refere
(pWindow->IsSystemWindow())
)
{
- sal_uIntPtr nMask = WINDOWSTATE_MASK_ALL;
+ sal_uLong nMask = WINDOWSTATE_MASK_ALL;
nMask &= ~(WINDOWSTATE_MASK_MINIMIZED);
sWindowState = B2U_ENC(
((SystemWindow*)pWindow)->GetWindowState(nMask),
diff --git a/framework/source/inc/pattern/window.hxx b/framework/source/inc/pattern/window.hxx
index b4937e0570a8..11fa0be9a767 100644
--- a/framework/source/inc/pattern/window.hxx
+++ b/framework/source/inc/pattern/window.hxx
@@ -81,7 +81,7 @@ static ::rtl::OUString getWindowState(const css::uno::Reference< css::awt::XWind
// check for system window is neccessary to guarantee correct pointer cast!
if (pWindow!=NULL && pWindow->IsSystemWindow())
{
- sal_uIntPtr nMask = WINDOWSTATE_MASK_ALL;
+ sal_uLong nMask = WINDOWSTATE_MASK_ALL;
nMask &= ~(WINDOWSTATE_MASK_MINIMIZED);
sWindowState = ((SystemWindow*)pWindow)->GetWindowState(nMask);
}
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 086d60ad1962..564e26f2651b 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -1576,7 +1576,7 @@ void AutoRecovery::implts_updateTimer()
)
return;
- sal_uIntPtr nMilliSeconds = 0;
+ sal_uLong nMilliSeconds = 0;
if (m_eTimerType == AutoRecovery::E_NORMAL_AUTOSAVE_INTERVALL)
{
nMilliSeconds = (m_nAutoSaveTimeIntervall*60000); // [min] => 60.000 ms
diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx
index dd6cc8e3306d..1d1e877a5a86 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -1136,7 +1136,7 @@ void BackingWindow::dispatchURL( const rtl::OUString& i_rURL,
if ( xDispatch.is() )
{
ImplDelayedDispatch* pDisp = new ImplDelayedDispatch( xDispatch, aDispatchURL, i_rArgs );
- sal_uIntPtr nEventId = 0;
+ sal_uLong nEventId = 0;
if( ! Application::PostUserEvent( nEventId, Link( NULL, implDispatchDelayed ), pDisp ) )
delete pDisp; // event could not be posted for unknown reason, at least don't leak
}
diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx
index 455231f7bc51..f140b8e22886 100644
--- a/framework/source/services/license.cxx
+++ b/framework/source/services/license.cxx
@@ -589,11 +589,11 @@ sal_Bool LicenseView::IsEndReached() const
ExtTextView* pView = GetTextView();
ExtTextEngine* pEdit = GetTextEngine();
- sal_uIntPtr nHeight = pEdit->GetTextHeight();
+ sal_uLong nHeight = pEdit->GetTextHeight();
Size aOutSize = pView->GetWindow()->GetOutputSizePixel();
Point aBottom( 0, aOutSize.Height() );
- if ( (sal_uIntPtr) pView->GetDocPos( aBottom ).Y() >= nHeight - 1 )
+ if ( (sal_uLong) pView->GetDocPos( aBottom ).Y() >= nHeight - 1 )
bEndReached = sal_True;
else
bEndReached = sal_False;
@@ -606,7 +606,7 @@ void LicenseView::Notify( SfxBroadcaster&, const SfxHint& rHint )
if ( rHint.IsA( TYPE(TextHint) ) )
{
sal_Bool bLastVal = EndReached();
- sal_uIntPtr nId = ((const TextHint&)rHint).GetId();
+ sal_uLong nId = ((const TextHint&)rHint).GetId();
if ( nId == TEXT_HINT_PARAINSERTED )
{
diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx
index 9d8c8fd8cae1..ef29214bc229 100644
--- a/framework/source/services/tabwindowservice.cxx
+++ b/framework/source/services/tabwindowservice.cxx
@@ -368,7 +368,7 @@ IMPL_LINK( TabWindowService, EventListener, VclSimpleEvent*, pEvent )
if ( !pEvent && !pEvent->ISA(VclWindowEvent))
return 0;
- sal_uIntPtr nEventId = pEvent->GetId();
+ sal_uLong nEventId = pEvent->GetId();
VclWindowEvent* pWinEvt = static_cast< VclWindowEvent* >(pEvent);
css::uno::Reference< css::uno::XInterface > xThis ( static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY );
@@ -399,19 +399,19 @@ IMPL_LINK( TabWindowService, EventListener, VclSimpleEvent*, pEvent )
switch (nEventId)
{
case VCLEVENT_TABPAGE_ACTIVATE :
- pListener->activated( (sal_Int32)(sal_uIntPtr)pWinEvt->GetData() );
+ pListener->activated( (sal_Int32)(sal_uLong)pWinEvt->GetData() );
break;
case VCLEVENT_TABPAGE_DEACTIVATE :
- pListener->deactivated( (sal_Int32)(sal_uIntPtr)pWinEvt->GetData() );
+ pListener->deactivated( (sal_Int32)(sal_uLong)pWinEvt->GetData() );
break;
case VCLEVENT_TABPAGE_INSERTED :
- pListener->inserted( (sal_Int32)(sal_uIntPtr)pWinEvt->GetData() );
+ pListener->inserted( (sal_Int32)(sal_uLong)pWinEvt->GetData() );
break;
case VCLEVENT_TABPAGE_REMOVED :
- pListener->removed( (sal_Int32)(sal_uIntPtr)pWinEvt->GetData() );
+ pListener->removed( (sal_Int32)(sal_uLong)pWinEvt->GetData() );
break;
case VCLEVENT_TABPAGE_PAGETEXTCHANGED :
diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx
index 34b0679a4b9e..b0384b18d3d1 100644
--- a/framework/source/uielement/addonstoolbarwrapper.cxx
+++ b/framework/source/uielement/addonstoolbarwrapper.cxx
@@ -143,7 +143,7 @@ void SAL_CALL AddonsToolBarWrapper::initialize( const Sequence< Any >& aArgument
Window* pWindow = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() );
if ( pWindow )
{
- sal_uIntPtr nStyles = WB_LINESPACING | WB_BORDER | WB_SCROLL | WB_MOVEABLE | WB_3DLOOK | WB_DOCKABLE | WB_SIZEABLE | WB_CLOSEABLE;
+ sal_uLong nStyles = WB_LINESPACING | WB_BORDER | WB_SCROLL | WB_MOVEABLE | WB_3DLOOK | WB_DOCKABLE | WB_SIZEABLE | WB_CLOSEABLE;
pToolBar = new ToolBar( pWindow, nStyles );
m_xToolBarWindow = VCLUnoHelper::GetInterface( pToolBar );
diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx
index a21b857e9522..af7e98e8ec23 100644
--- a/framework/source/uielement/fontsizemenucontroller.cxx
+++ b/framework/source/uielement/fontsizemenucontroller.cxx
@@ -214,8 +214,8 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
if ( pAry == pFontList->GetStdSizeAry() )
{
// for scalable fonts all font size names
- sal_uIntPtr nCount = aFontSizeNames.Count();
- for( sal_uIntPtr i = 0; i < nCount; i++ )
+ sal_uLong nCount = aFontSizeNames.Count();
+ for( sal_uLong i = 0; i < nCount; i++ )
{
String aSizeName = aFontSizeNames.GetIndexName( i );
long nSize = aFontSizeNames.GetIndexSize( i );
diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx
index 06a3ac6c005b..b355a6542f59 100644
--- a/framework/source/uielement/statusbarwrapper.cxx
+++ b/framework/source/uielement/statusbarwrapper.cxx
@@ -131,7 +131,7 @@ void SAL_CALL StatusBarWrapper::initialize( const Sequence< Any >& aArguments )
Window* pWindow = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() );
if ( pWindow )
{
- sal_uIntPtr nStyles = WinBits( WB_LEFT | WB_3DLOOK );
+ sal_uLong nStyles = WinBits( WB_LEFT | WB_3DLOOK );
pStatusBar = new FrameworkStatusBar( pWindow, nStyles );
pStatusBarManager = new StatusBarManager( m_xServiceFactory, xFrame, m_aResourceURL, pStatusBar );
diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx
index 0f838bd1ccd3..8e86f6b84639 100644
--- a/framework/source/uielement/toolbarwrapper.cxx
+++ b/framework/source/uielement/toolbarwrapper.cxx
@@ -178,7 +178,7 @@ void SAL_CALL ToolBarWrapper::initialize( const Sequence< Any >& aArguments ) th
Window* pWindow = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() );
if ( pWindow )
{
- sal_uIntPtr nStyles = WB_LINESPACING | WB_BORDER | WB_SCROLL | WB_MOVEABLE | WB_3DLOOK | WB_DOCKABLE | WB_SIZEABLE | WB_CLOSEABLE;
+ sal_uLong nStyles = WB_LINESPACING | WB_BORDER | WB_SCROLL | WB_MOVEABLE | WB_3DLOOK | WB_DOCKABLE | WB_SIZEABLE | WB_CLOSEABLE;
pToolBar = new ToolBar( pWindow, nStyles );
m_xToolBarWindow = VCLUnoHelper::GetInterface( pToolBar );
generated by cgit (git 2.34.1) at 2024-08-15 12:00:04 +0000