summaryrefslogtreecommitdiff
path: root/forms/source/solar
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2011-03-18 15:35:18 +0100
committerJan Holesovsky <kendy@suse.cz>2011-03-18 15:35:18 +0100
commit6a75a47be7b3aafbb655ffa70609fd2ed7ca4b3e (patch)
treed00d2024213e09b8eba4704b8b6660eb42c3921c /forms/source/solar
parent7fb1e1ea8c9f8d3ef13524d1327272824df7110d (diff)
parenteee3dbc7af039669d447d2e55abd896ea3383df1 (diff)
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts: automation/source/communi/communi.cxx automation/source/server/recorder.cxx automation/source/server/server.cxx basctl/source/basicide/basobj2.cxx
Diffstat (limited to 'forms/source/solar')
-rw-r--r--forms/source/solar/component/navbarcontrol.cxx6
-rw-r--r--forms/source/solar/component/navbarcontrol.hxx6
-rw-r--r--forms/source/solar/control/navtoolbar.cxx68
-rw-r--r--forms/source/solar/inc/navtoolbar.hxx18
4 files changed, 47 insertions, 51 deletions
diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx
index 673501803f29..f0e552d79fba 100644
--- a/forms/source/solar/component/navbarcontrol.cxx
+++ b/forms/source/solar/component/navbarcontrol.cxx
@@ -107,7 +107,7 @@ namespace frm
DBG_NAME( ONavigationBarControl )
//------------------------------------------------------------------
ONavigationBarControl::ONavigationBarControl( const Reference< XMultiServiceFactory >& _rxORB )
- :m_xORB( _rxORB )
+ :UnoControl( _rxORB )
{
DBG_CTOR( ONavigationBarControl, NULL );
}
@@ -182,7 +182,7 @@ namespace frm
}
// create the peer
- ONavigationBarPeer* pPeer = ONavigationBarPeer::Create( m_xORB, pParentWin, getModel() );
+ ONavigationBarPeer* pPeer = ONavigationBarPeer::Create( maContext.getLegacyServiceFactory(), pParentWin, getModel() );
DBG_ASSERT( pPeer, "ONavigationBarControl::createPeer: invalid peer returned!" );
if ( pPeer )
// by definition, the returned component is aquired once
@@ -301,7 +301,7 @@ namespace frm
MouseSettings aMouseSettings = aSettings.GetMouseSettings();
aMouseSettings.SetButtonRepeat( 10 );
aSettings.SetMouseSettings( aMouseSettings );
- pNavBar->SetSettings( aSettings, TRUE );
+ pNavBar->SetSettings( aSettings, sal_True );
// outta here
return pPeer;
diff --git a/forms/source/solar/component/navbarcontrol.hxx b/forms/source/solar/component/navbarcontrol.hxx
index 864ff225e8de..33becc6476de 100644
--- a/forms/source/solar/component/navbarcontrol.hxx
+++ b/forms/source/solar/component/navbarcontrol.hxx
@@ -40,7 +40,7 @@
#include <toolkit/awt/vclxwindow.hxx>
#include <comphelper/uno3.hxx>
#include <cppuhelper/implbase1.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
//.........................................................................
namespace frm
@@ -57,10 +57,6 @@ namespace frm
:public UnoControl
,public ONavigationBarControl_Base
{
- private:
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
- m_xORB;
-
public:
ONavigationBarControl(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB
diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx
index b408b7052578..f87cd2c9d3a6 100644
--- a/forms/source/solar/control/navtoolbar.cxx
+++ b/forms/source/solar/control/navtoolbar.cxx
@@ -66,7 +66,7 @@ namespace frm
|| ( _nFeatureId == LID_RECORD_FILLER );
}
- static String getLabelString( USHORT _nResId )
+ static String getLabelString( sal_uInt16 _nResId )
{
String sLabel = String::CreateFromAscii( " " );
sLabel += String( FRM_RES_STRING( _nResId ) );
@@ -197,9 +197,9 @@ namespace frm
//---------------------------------------------------------------------
void NavigationToolBar::updateFeatureStates( )
{
- for ( USHORT nPos = 0; nPos < m_pToolbar->GetItemCount(); ++nPos )
+ for ( sal_uInt16 nPos = 0; nPos < m_pToolbar->GetItemCount(); ++nPos )
{
- USHORT nItemId = m_pToolbar->GetItemId( nPos );
+ sal_uInt16 nItemId = m_pToolbar->GetItemId( nPos );
if ( ( nItemId == LID_RECORD_LABEL ) || ( nItemId == LID_RECORD_FILLER ) )
continue;
@@ -211,7 +211,7 @@ namespace frm
}
//---------------------------------------------------------------------
- void NavigationToolBar::implEnableItem( USHORT _nItemId, bool _bEnabled )
+ void NavigationToolBar::implEnableItem( sal_uInt16 _nItemId, bool _bEnabled )
{
m_pToolbar->EnableItem( _nItemId, _bEnabled );
@@ -225,32 +225,32 @@ namespace frm
//---------------------------------------------------------------------
void NavigationToolBar::enableFeature( sal_Int16 _nFeatureId, bool _bEnabled )
{
- DBG_ASSERT( m_pToolbar->GetItemPos( (USHORT)_nFeatureId ) != TOOLBOX_ITEM_NOTFOUND,
+ DBG_ASSERT( m_pToolbar->GetItemPos( (sal_uInt16)_nFeatureId ) != TOOLBOX_ITEM_NOTFOUND,
"NavigationToolBar::enableFeature: invalid id!" );
- implEnableItem( (USHORT)_nFeatureId, _bEnabled );
+ implEnableItem( (sal_uInt16)_nFeatureId, _bEnabled );
}
//---------------------------------------------------------------------
void NavigationToolBar::checkFeature( sal_Int16 _nFeatureId, bool _bEnabled )
{
- DBG_ASSERT( m_pToolbar->GetItemPos( (USHORT)_nFeatureId ) != TOOLBOX_ITEM_NOTFOUND,
+ DBG_ASSERT( m_pToolbar->GetItemPos( (sal_uInt16)_nFeatureId ) != TOOLBOX_ITEM_NOTFOUND,
"NavigationToolBar::checkFeature: invalid id!" );
- m_pToolbar->CheckItem( (USHORT)_nFeatureId, _bEnabled );
+ m_pToolbar->CheckItem( (sal_uInt16)_nFeatureId, _bEnabled );
}
//---------------------------------------------------------------------
void NavigationToolBar::setFeatureText( sal_Int16 _nFeatureId, const ::rtl::OUString& _rText )
{
- DBG_ASSERT( m_pToolbar->GetItemPos( (USHORT)_nFeatureId ) != TOOLBOX_ITEM_NOTFOUND,
+ DBG_ASSERT( m_pToolbar->GetItemPos( (sal_uInt16)_nFeatureId ) != TOOLBOX_ITEM_NOTFOUND,
"NavigationToolBar::checkFeature: invalid id!" );
- Window* pItemWindow = m_pToolbar->GetItemWindow( (USHORT)_nFeatureId );
+ Window* pItemWindow = m_pToolbar->GetItemWindow( (sal_uInt16)_nFeatureId );
if ( pItemWindow )
pItemWindow->SetText( _rText );
else
- m_pToolbar->SetItemText( (USHORT)_nFeatureId, _rText );
+ m_pToolbar->SetItemText( (sal_uInt16)_nFeatureId, _rText );
}
//---------------------------------------------------------------------
@@ -266,7 +266,7 @@ namespace frm
struct FeatureDescription
{
- USHORT nId;
+ sal_uInt16 nId;
bool bRepeat;
bool bItemWindow;
} aSupportedFeatures[] =
@@ -333,7 +333,7 @@ namespace frm
{
pItemWindow = new FixedText( m_pToolbar, WB_VCENTER );
pItemWindow->SetBackground();
- pItemWindow->SetPaintTransparent(TRUE);
+ pItemWindow->SetPaintTransparent(sal_True);
}
m_aChildWins.push_back( pItemWindow );
@@ -369,16 +369,16 @@ namespace frm
if ( !m_pImageProvider )
return;
- const USHORT nItemCount = m_pToolbar->GetItemCount();
+ const sal_uInt16 nItemCount = m_pToolbar->GetItemCount();
// collect the FormFeatures in the toolbar
typedef ::std::vector< sal_Int16 > FormFeatures;
FormFeatures aFormFeatures;
aFormFeatures.reserve( nItemCount );
- for ( USHORT i=0; i<nItemCount; ++i )
+ for ( sal_uInt16 i=0; i<nItemCount; ++i )
{
- USHORT nId = m_pToolbar->GetItemId( i );
+ sal_uInt16 nId = m_pToolbar->GetItemId( i );
if ( ( TOOLBOXITEM_BUTTON == m_pToolbar->GetItemType( i ) ) && !isArtificialItem( nId ) )
aFormFeatures.push_back( nId );
}
@@ -429,13 +429,13 @@ namespace frm
//---------------------------------------------------------------------
void NavigationToolBar::ShowFunctionGroup( FunctionGroup _eGroup, bool _bShow )
{
- const USHORT* pGroupIds = NULL;
+ const sal_uInt16* pGroupIds = NULL;
switch ( _eGroup )
{
case ePosition:
{
- static const USHORT aPositionIds[] = {
+ static const sal_uInt16 aPositionIds[] = {
LID_RECORD_LABEL, FormFeature::MoveAbsolute, LID_RECORD_FILLER, FormFeature::TotalRecords, 0
};
pGroupIds = aPositionIds;
@@ -443,7 +443,7 @@ namespace frm
break;
case eNavigation:
{
- static const USHORT aNavigationIds[] = {
+ static const sal_uInt16 aNavigationIds[] = {
FormFeature::MoveToFirst, FormFeature::MoveToPrevious, FormFeature::MoveToNext, FormFeature::MoveToLast, FormFeature::MoveToInsertRow, 0
};
pGroupIds = aNavigationIds;
@@ -451,7 +451,7 @@ namespace frm
break;
case eRecordActions:
{
- static const USHORT aActionIds[] = {
+ static const sal_uInt16 aActionIds[] = {
FormFeature::SaveRecordChanges, FormFeature::UndoRecordChanges, FormFeature::DeleteRecord, FormFeature::ReloadForm, FormFeature::RefreshCurrentControl, 0
};
pGroupIds = aActionIds;
@@ -459,7 +459,7 @@ namespace frm
break;
case eFilterSort:
{
- static const USHORT aFilterSortIds[] = {
+ static const sal_uInt16 aFilterSortIds[] = {
FormFeature::SortAscending, FormFeature::SortDescending, FormFeature::InteractiveSort, FormFeature::AutoFilter, FormFeature::InteractiveFilter, FormFeature::ToggleApplyFilter, FormFeature::RemoveFilterAndSort, 0
};
pGroupIds = aFilterSortIds;
@@ -477,7 +477,7 @@ namespace frm
//---------------------------------------------------------------------
bool NavigationToolBar::IsFunctionGroupVisible( FunctionGroup _eGroup )
{
- USHORT nIndicatorItem = 0;
+ sal_uInt16 nIndicatorItem = 0;
switch ( _eGroup )
{
case ePosition : nIndicatorItem = LID_RECORD_LABEL; break;
@@ -516,7 +516,7 @@ namespace frm
case STATE_CHANGE_MIRRORING:
{
- BOOL bIsRTLEnabled( IsRTLEnabled() );
+ sal_Bool bIsRTLEnabled( IsRTLEnabled() );
m_pToolbar->EnableRTL( bIsRTLEnabled );
forEachItemWindow( &NavigationToolBar::enableItemRTL, &bIsRTLEnabled );
Resize();
@@ -577,9 +577,9 @@ namespace frm
//---------------------------------------------------------------------
void NavigationToolBar::forEachItemWindow( ItemWindowHandler _handler, const void* _pParam )
{
- for ( USHORT item = 0; item < m_pToolbar->GetItemCount(); ++item )
+ for ( sal_uInt16 item = 0; item < m_pToolbar->GetItemCount(); ++item )
{
- USHORT nItemId = m_pToolbar->GetItemId( item );
+ sal_uInt16 nItemId = m_pToolbar->GetItemId( item );
Window* pItemWindow = m_pToolbar->GetItemWindow( nItemId );
if ( pItemWindow )
(this->*_handler)( nItemId, pItemWindow, _pParam );
@@ -587,7 +587,7 @@ namespace frm
}
//---------------------------------------------------------------------
- void NavigationToolBar::setItemBackground( USHORT /* _nItemId */, Window* _pItemWindow, const void* _pColor ) const
+ void NavigationToolBar::setItemBackground( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* _pColor ) const
{
if ( _pColor )
_pItemWindow->SetControlBackground( *static_cast< const Color* >( _pColor ) );
@@ -596,7 +596,7 @@ namespace frm
}
//---------------------------------------------------------------------
- void NavigationToolBar::setTextLineColor( USHORT /* _nItemId */, Window* _pItemWindow, const void* _pColor ) const
+ void NavigationToolBar::setTextLineColor( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* _pColor ) const
{
if ( _pColor )
_pItemWindow->SetTextLineColor( *static_cast< const Color* >( _pColor ) );
@@ -605,14 +605,14 @@ namespace frm
}
#if 0
//---------------------------------------------------------------------
- void NavigationToolBar::setItemWindowZoom( USHORT /* _nItemId */, Window* _pItemWindow, const void* /* _pParam */ ) const
+ void NavigationToolBar::setItemWindowZoom( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* /* _pParam */ ) const
{
_pItemWindow->SetZoom( GetZoom() );
_pItemWindow->SetZoomedPointFont( IsControlFont() ? GetControlFont() : GetPointFont() );
}
#endif
//---------------------------------------------------------------------
- void NavigationToolBar::setItemControlFont( USHORT /* _nItemId */, Window* _pItemWindow, const void* /* _pParam */ ) const
+ void NavigationToolBar::setItemControlFont( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* /* _pParam */ ) const
{
if ( IsControlFont() )
_pItemWindow->SetControlFont( GetControlFont() );
@@ -621,7 +621,7 @@ namespace frm
}
//---------------------------------------------------------------------
- void NavigationToolBar::setItemControlForeground( USHORT /* _nItemId */, Window* _pItemWindow, const void* /* _pParam */ ) const
+ void NavigationToolBar::setItemControlForeground( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* /* _pParam */ ) const
{
if ( IsControlForeground() )
_pItemWindow->SetControlForeground( GetControlForeground() );
@@ -631,7 +631,7 @@ namespace frm
}
//---------------------------------------------------------------------
- void NavigationToolBar::adjustItemWindowWidth( USHORT _nItemId, Window* _pItemWindow, const void* /* _pParam */ ) const
+ void NavigationToolBar::adjustItemWindowWidth( sal_uInt16 _nItemId, Window* _pItemWindow, const void* /* _pParam */ ) const
{
String sItemText;
switch ( _nItemId )
@@ -661,9 +661,9 @@ namespace frm
}
//---------------------------------------------------------------------
- void NavigationToolBar::enableItemRTL( USHORT /*_nItemId*/, Window* _pItemWindow, const void* _pIsRTLEnabled ) const
+ void NavigationToolBar::enableItemRTL( sal_uInt16 /*_nItemId*/, Window* _pItemWindow, const void* _pIsRTLEnabled ) const
{
- _pItemWindow->EnableRTL( *static_cast< const BOOL* >( _pIsRTLEnabled ) );
+ _pItemWindow->EnableRTL( *static_cast< const sal_Bool* >( _pIsRTLEnabled ) );
}
//=====================================================================
@@ -678,7 +678,7 @@ namespace frm
SetFirst( 1 );
SetSpinSize( 1 );
SetDecimalDigits( 0 );
- SetStrictFormat( TRUE );
+ SetStrictFormat( sal_True );
SetBorderStyle( WINDOW_BORDER_MONO );
}
diff --git a/forms/source/solar/inc/navtoolbar.hxx b/forms/source/solar/inc/navtoolbar.hxx
index 03343e5d2d8b..0cc1a1c2cfd7 100644
--- a/forms/source/solar/inc/navtoolbar.hxx
+++ b/forms/source/solar/inc/navtoolbar.hxx
@@ -142,25 +142,25 @@ namespace frm
void implUpdateImages();
/// enables or disables an item, plus possible dependent items
- void implEnableItem( USHORT _nItemId, bool _bEnabled );
+ void implEnableItem( sal_uInt16 _nItemId, bool _bEnabled );
/** update the states of all features, using the callback
*/
void updateFeatureStates( );
// iterating through item windows
- typedef void (NavigationToolBar::*ItemWindowHandler) (USHORT, Window*, const void*) const;
+ typedef void (NavigationToolBar::*ItemWindowHandler) (sal_uInt16, Window*, const void*) const;
void forEachItemWindow( ItemWindowHandler _handler, const void* _pParam );
- void setItemBackground( USHORT /* _nItemId */, Window* _pItemWindow, const void* _pColor ) const;
- void setTextLineColor( USHORT /* _nItemId */, Window* _pItemWindow, const void* _pColor ) const;
+ void setItemBackground( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* _pColor ) const;
+ void setTextLineColor( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* _pColor ) const;
#if 0
- void setItemWindowZoom( USHORT /* _nItemId */, Window* _pItemWindow, const void* /* _pParam */ ) const;
+ void setItemWindowZoom( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* /* _pParam */ ) const;
#endif
- void setItemControlFont( USHORT /* _nItemId */, Window* _pItemWindow, const void* /* _pParam */ ) const;
- void setItemControlForeground( USHORT /* _nItemId */, Window* _pItemWindow, const void* /* _pParam */ ) const;
- void adjustItemWindowWidth( USHORT _nItemId, Window* _pItemWindow, const void* /* _pParam */ ) const;
- void enableItemRTL( USHORT /*_nItemId*/, Window* _pItemWindow, const void* _pIsRTLEnabled ) const;
+ void setItemControlFont( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* /* _pParam */ ) const;
+ void setItemControlForeground( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* /* _pParam */ ) const;
+ void adjustItemWindowWidth( sal_uInt16 _nItemId, Window* _pItemWindow, const void* /* _pParam */ ) const;
+ void enableItemRTL( sal_uInt16 /*_nItemId*/, Window* _pItemWindow, const void* _pIsRTLEnabled ) const;
};
//=====================================================================