summaryrefslogtreecommitdiff
path: root/svx/source/form
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/form')
-rw-r--r--svx/source/form/datanavi.cxx112
-rw-r--r--svx/source/form/dbtoolsclient.cxx2
-rw-r--r--svx/source/form/filtnav.cxx4
-rw-r--r--svx/source/form/fmexpl.cxx2
-rw-r--r--svx/source/form/fmmodel.cxx2
-rw-r--r--svx/source/form/fmobjfac.cxx4
-rw-r--r--svx/source/form/fmpage.cxx4
-rw-r--r--svx/source/form/fmscriptingenv.cxx84
-rw-r--r--svx/source/form/fmshell.cxx2
-rw-r--r--svx/source/form/fmshimp.cxx14
-rw-r--r--svx/source/form/fmtextcontroldialogs.cxx2
-rw-r--r--svx/source/form/fmtextcontrolshell.cxx2
-rw-r--r--svx/source/form/fmundo.cxx13
-rw-r--r--svx/source/form/fmview.cxx17
-rw-r--r--svx/source/form/fmvwimp.cxx32
-rw-r--r--svx/source/form/formcontroller.cxx2
-rw-r--r--svx/source/form/formtoolbars.cxx6
-rw-r--r--svx/source/form/makefile.mk119
-rw-r--r--svx/source/form/navigatortree.cxx14
-rw-r--r--svx/source/form/navigatortreemodel.cxx4
-rw-r--r--svx/source/form/stringlistresource.cxx2
-rw-r--r--svx/source/form/tabwin.cxx6
-rw-r--r--svx/source/form/tbxform.cxx40
23 files changed, 166 insertions, 323 deletions
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index aecb4f295efa..de429ca75c57 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -265,7 +265,7 @@ namespace svxform
return pMenu;
}
- void DataTreeListBox::ExcecuteContextMenuAction( USHORT _nSelectedPopupEntry )
+ void DataTreeListBox::ExcecuteContextMenuAction( sal_uInt16 _nSelectedPopupEntry )
{
m_pXFormsPage->DoMenuAction( _nSelectedPopupEntry );
}
@@ -281,7 +281,7 @@ namespace svxform
void DataTreeListBox::DeleteAndClear()
{
- ULONG i, nCount = GetEntryCount();
+ sal_uIntPtr i, nCount = GetEntryCount();
for ( i = 0; i < nCount; ++i )
{
SvLBoxEntry* pEntry = GetEntry(i);
@@ -411,7 +411,7 @@ namespace svxform
{
ItemNode* pNode = new ItemNode( xChild );
SvLBoxEntry* pEntry = m_aItemList.InsertEntry(
- sName, aExpImg, aCollImg, _pParent, FALSE, LIST_APPEND, pNode );
+ sName, aExpImg, aCollImg, _pParent, sal_False, LIST_APPEND, pNode );
if ( xChild->hasAttributes() )
{
Reference< css::xml::dom::XNamedNodeMap > xMap = xChild->getAttributes();
@@ -427,7 +427,7 @@ namespace svxform
m_xUIHelper->getNodeDisplayName( xAttr, bShowDetails );
m_aItemList.InsertEntry(
sAttrName, aExpImg, aCollImg,
- pEntry, FALSE, LIST_APPEND, pNode );
+ pEntry, sal_False, LIST_APPEND, pNode );
}
}
}
@@ -443,7 +443,7 @@ namespace svxform
}
}
//------------------------------------------------------------------------
- bool XFormsPage::DoToolBoxAction( USHORT _nToolBoxID ) {
+ bool XFormsPage::DoToolBoxAction( sal_uInt16 _nToolBoxID ) {
bool bHandled = false;
bool bIsDocModified = false;
@@ -470,7 +470,7 @@ namespace svxform
xSubmissions->insert( makeAny( xNewSubmission ) );
Reference< XPropertySet > xNewPropSet( xNewSubmission, UNO_QUERY );
SvLBoxEntry* pEntry = AddEntry( xNewPropSet );
- m_aItemList.Select( pEntry, TRUE );
+ m_aItemList.Select( pEntry, sal_True );
bIsDocModified = true;
}
catch ( Exception& )
@@ -486,7 +486,7 @@ namespace svxform
ItemNode* pNode = NULL;
Reference< css::xml::dom::XNode > xParentNode;
Reference< XPropertySet > xNewBinding;
- USHORT nResId = 0;
+ sal_uInt16 nResId = 0;
bool bIsElement = true;
if ( DGTInstance == m_eGroup )
{
@@ -597,7 +597,7 @@ namespace svxform
{
SvLBoxEntry* pNewEntry = AddEntry( pNode, bIsElement );
m_aItemList.MakeVisible( pNewEntry );
- m_aItemList.Select( pNewEntry, TRUE );
+ m_aItemList.Select( pNewEntry, sal_True );
bIsDocModified = true;
}
else
@@ -623,7 +623,7 @@ namespace svxform
if ( RET_OK == nReturn )
{
SvLBoxEntry* pNewEntry = AddEntry( xNewBinding );
- m_aItemList.Select( pNewEntry, TRUE );
+ m_aItemList.Select( pNewEntry, sal_True );
bIsDocModified = true;
}
else
@@ -664,7 +664,7 @@ namespace svxform
AddDataItemDialog aDlg( this, pNode, m_xUIHelper );
DataItemType eType = DITElement;
- USHORT nResId = RID_STR_DATANAV_EDIT_ELEMENT;
+ sal_uInt16 nResId = RID_STR_DATANAV_EDIT_ELEMENT;
if ( pNode && pNode->m_xNode.is() )
{
try
@@ -778,7 +778,7 @@ namespace svxform
const ImageList& rImageList = GetSettings().GetStyleSettings().GetHighContrastMode()
? m_pNaviWin->GetItemHCImageList()
: m_pNaviWin->GetItemImageList();
- USHORT nImageID = ( _bIsElement ) ? IID_ELEMENT : IID_ATTRIBUTE;
+ sal_uInt16 nImageID = ( _bIsElement ) ? IID_ELEMENT : IID_ATTRIBUTE;
Image aImage = rImageList.GetImage( nImageID );
::rtl::OUString sName;
try
@@ -791,7 +791,7 @@ namespace svxform
DBG_UNHANDLED_EXCEPTION();
}
return m_aItemList.InsertEntry(
- sName, aImage, aImage, pParent, FALSE, LIST_APPEND, _pNewNode );
+ sName, aImage, aImage, pParent, sal_False, LIST_APPEND, _pNewNode );
}
//------------------------------------------------------------------------
class lcl_ResourceString
@@ -999,7 +999,7 @@ namespace svxform
{
// ID
_rEntry->getPropertyValue( PN_SUBMISSION_ID ) >>= sTemp;
- pEntry = m_aItemList.InsertEntry( sTemp, aImage, aImage, NULL, FALSE, LIST_APPEND, pNode );
+ pEntry = m_aItemList.InsertEntry( sTemp, aImage, aImage, NULL, sal_False, LIST_APPEND, pNode );
// Action
_rEntry->getPropertyValue( PN_SUBMISSION_ACTION ) >>= sTemp;
String sEntry = SVX_RESSTR( RID_STR_DATANAV_SUBM_ACTION );
@@ -1043,7 +1043,7 @@ namespace svxform
_rEntry->getPropertyValue( PN_BINDING_EXPR ) >>= sTemp;
sName += String( sTemp );
pEntry = m_aItemList.InsertEntry(
- sName, aImage, aImage, NULL, FALSE, LIST_APPEND, pNode );
+ sName, aImage, aImage, NULL, sal_False, LIST_APPEND, pNode );
}
catch ( Exception& )
{
@@ -1080,7 +1080,7 @@ namespace svxform
_rEntry->getPropertyValue( PN_SUBMISSION_BIND ) >>= sTemp;
String sEntry = SVX_RESSTR( RID_STR_DATANAV_SUBM_BIND );
sEntry += String( sTemp );
- ULONG nPos = 0;
+ sal_uIntPtr nPos = 0;
SvLBoxEntry* pChild = m_aItemList.GetEntry( pEntry, nPos++ );
m_aItemList.SetEntryText( pChild, sEntry );
_rEntry->getPropertyValue( PN_SUBMISSION_REF ) >>= sTemp;
@@ -1131,7 +1131,7 @@ namespace svxform
DBG_ASSERT( pNode->m_xNode.is(), "XFormsPage::RemoveEntry(): no XNode" );
css::xml::dom::NodeType eChildType = pNode->m_xNode->getNodeType();
bool bIsElement = ( eChildType == css::xml::dom::NodeType_ELEMENT_NODE );
- USHORT nResId = bIsElement ? RID_QRY_REMOVE_ELEMENT : RID_QRY_REMOVE_ATTRIBUTE;
+ sal_uInt16 nResId = bIsElement ? RID_QRY_REMOVE_ELEMENT : RID_QRY_REMOVE_ATTRIBUTE;
String sVar = bIsElement ? ELEMENTNAME : ATTRIBUTENAME;
QueryBox aQBox( this, SVX_RES( nResId ) );
String sMessText = aQBox.GetMessText();
@@ -1163,7 +1163,7 @@ namespace svxform
{
DBG_ASSERT( pNode->m_xPropSet.is(), "XFormsPage::RemoveEntry(): no propset" );
bool bSubmission = ( DGTSubmission == m_eGroup );
- USHORT nResId = bSubmission ? RID_QRY_REMOVE_SUBMISSION : RID_QRY_REMOVE_BINDING;
+ sal_uInt16 nResId = bSubmission ? RID_QRY_REMOVE_SUBMISSION : RID_QRY_REMOVE_BINDING;
rtl::OUString sProperty = bSubmission ? PN_SUBMISSION_ID : PN_BINDING_ID;
String sSearch = bSubmission ? SUBMISSIONNAME : BINDINGNAME;
rtl::OUString sName;
@@ -1210,7 +1210,7 @@ namespace svxform
if ( rNEvt.GetType() == EVENT_KEYINPUT )
{
- USHORT nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
+ sal_uInt16 nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
switch ( nCode )
{
@@ -1234,7 +1234,7 @@ namespace svxform
m_aItemList.SetPosSizePixel( Point( 2, 2 + aTbxSize.Height() ), aSize );
}
//------------------------------------------------------------------------
- String XFormsPage::SetModel( const Reference< css::xforms::XModel >& _xModel, USHORT _nPagePos )
+ String XFormsPage::SetModel( const Reference< css::xforms::XModel >& _xModel, sal_uInt16 _nPagePos )
{
DBG_ASSERT( _xModel.is(), "XFormsPage::SetModel(): invalid model" );
@@ -1256,7 +1256,7 @@ namespace svxform
if ( xContainer.is() )
m_pNaviWin->AddContainerBroadcaster( xContainer );
- USHORT nIter = 0;
+ sal_uInt16 nIter = 0;
Reference< XEnumerationAccess > xNumAccess( _xModel->getInstances(), UNO_QUERY );
if ( xNumAccess.is() )
{
@@ -1359,7 +1359,7 @@ namespace svxform
ItemNode* pNode = new ItemNode( xPropSet );
m_aItemList.InsertEntry(
- sEntry, aImage1, aImage2, NULL, FALSE, LIST_APPEND, pNode );
+ sEntry, aImage1, aImage2, NULL, sal_False, LIST_APPEND, pNode );
}
}
}
@@ -1436,7 +1436,7 @@ namespace svxform
}
//------------------------------------------------------------------------
- bool XFormsPage::DoMenuAction( USHORT _nMenuID )
+ bool XFormsPage::DoMenuAction( sal_uInt16 _nMenuID )
{
return DoToolBoxAction( _nMenuID );
}
@@ -1444,14 +1444,14 @@ namespace svxform
//------------------------------------------------------------------------
void XFormsPage::EnableMenuItems( Menu* _pMenu )
{
- BOOL bEnableAdd = FALSE;
- BOOL bEnableEdit = FALSE;
- BOOL bEnableRemove = FALSE;
+ sal_Bool bEnableAdd = sal_False;
+ sal_Bool bEnableEdit = sal_False;
+ sal_Bool bEnableRemove = sal_False;
SvLBoxEntry* pEntry = m_aItemList.FirstSelected();
if ( pEntry )
{
- bEnableAdd = TRUE;
+ bEnableAdd = sal_True;
bool bSubmitChild = false;
if ( DGTSubmission == m_eGroup && m_aItemList.GetParent( pEntry ) )
{
@@ -1461,10 +1461,10 @@ namespace svxform
ItemNode* pNode = static_cast< ItemNode* >( pEntry->GetUserData() );
if ( pNode && ( pNode->m_xNode.is() || pNode->m_xPropSet.is() ) )
{
- bEnableEdit = TRUE;
+ bEnableEdit = sal_True;
bEnableRemove = ( bSubmitChild != true );
if ( DGTInstance == m_eGroup && !m_aItemList.GetParent( pEntry ) )
- bEnableRemove = FALSE;
+ bEnableRemove = sal_False;
if ( pNode->m_xNode.is() )
{
try
@@ -1473,7 +1473,7 @@ namespace svxform
if ( eChildType != css::xml::dom::NodeType_ELEMENT_NODE
&& eChildType != css::xml::dom::NodeType_DOCUMENT_NODE )
{
- bEnableAdd = FALSE;
+ bEnableAdd = sal_False;
}
}
catch ( Exception& )
@@ -1484,7 +1484,7 @@ namespace svxform
}
}
else if ( m_eGroup != DGTInstance )
- bEnableAdd = TRUE;
+ bEnableAdd = sal_True;
m_aToolBox.EnableItem( TBI_ITEM_ADD, bEnableAdd );
m_aToolBox.EnableItem( TBI_ITEM_ADD_ELEMENT, bEnableAdd );
@@ -1502,8 +1502,8 @@ namespace svxform
}
if ( DGTInstance == m_eGroup )
{
- USHORT nResId1 = RID_STR_DATANAV_EDIT_ELEMENT;
- USHORT nResId2 = RID_STR_DATANAV_REMOVE_ELEMENT;
+ sal_uInt16 nResId1 = RID_STR_DATANAV_EDIT_ELEMENT;
+ sal_uInt16 nResId2 = RID_STR_DATANAV_REMOVE_ELEMENT;
if ( pEntry )
{
ItemNode* pNode = static_cast< ItemNode* >( pEntry->GetUserData() );
@@ -1601,7 +1601,7 @@ namespace svxform
pMenu->SetItemBits( MID_SHOW_DETAILS, MIB_CHECKABLE );
pMenu->CheckItem( MID_SHOW_DETAILS, m_bShowDetails );
- m_aTabCtrl.SetCurPageId( static_cast< USHORT >( nPageId ) );
+ m_aTabCtrl.SetCurPageId( static_cast< sal_uInt16 >( nPageId ) );
ActivatePageHdl( &m_aTabCtrl );
// get our frame
@@ -1645,7 +1645,7 @@ namespace svxform
// -----------------------------------------------------------------------
IMPL_LINK( DataNavigatorWindow, ModelSelectHdl, ListBox *, pBox )
{
- USHORT nPos = m_aModelsBox.GetSelectEntryPos();
+ sal_uInt16 nPos = m_aModelsBox.GetSelectEntryPos();
// pBox == NULL, if you want to force a new fill.
if ( nPos != m_nLastSelectedPos || !pBox )
{
@@ -1662,7 +1662,7 @@ namespace svxform
{
bool bIsDocModified = false;
Reference< css::xforms::XFormsUIHelper1 > xUIHelper;
- USHORT nSelectedPos = m_aModelsBox.GetSelectEntryPos();
+ sal_uInt16 nSelectedPos = m_aModelsBox.GetSelectEntryPos();
::rtl::OUString sSelectedModel( m_aModelsBox.GetEntry( nSelectedPos ) );
Reference< css::xforms::XModel > xModel;
try
@@ -1718,7 +1718,7 @@ namespace svxform
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ExternalData" ) ),
makeAny( sal_Bool( !bDocumentData ) ) );
- USHORT nNewPos = m_aModelsBox.InsertEntry( sNewName );
+ sal_uInt16 nNewPos = m_aModelsBox.InsertEntry( sNewName );
m_aModelsBox.SelectEntryPos( nNewPos );
ModelSelectHdl( &m_aModelsBox );
bIsDocModified = true;
@@ -1835,7 +1835,7 @@ namespace svxform
AddInstanceDialog aDlg( this, false );
if ( aDlg.Execute() == RET_OK )
{
- USHORT nInst = GetNewPageId();
+ sal_uInt16 nInst = GetNewPageId();
::rtl::OUString sName = aDlg.GetName();
::rtl::OUString sURL = aDlg.GetURL();
bool bLinkOnce = aDlg.IsLinkInstance();
@@ -1861,7 +1861,7 @@ namespace svxform
}
case MID_INSTANCES_EDIT :
{
- USHORT nId = 0;
+ sal_uInt16 nId = 0;
XFormsPage* pPage = GetCurrentPage( nId );
if ( pPage )
{
@@ -1897,7 +1897,7 @@ namespace svxform
}
case MID_INSTANCES_REMOVE :
{
- USHORT nId = 0;
+ sal_uInt16 nId = 0;
XFormsPage* pPage = GetCurrentPage( nId );
if ( pPage )
{
@@ -1997,7 +1997,7 @@ namespace svxform
// -----------------------------------------------------------------------
IMPL_LINK( DataNavigatorWindow, ActivatePageHdl, TabControl *, EMPTYARG )
{
- USHORT nId = 0;
+ sal_uInt16 nId = 0;
XFormsPage* pPage = GetCurrentPage( nId );
if ( pPage )
{
@@ -2015,7 +2015,7 @@ namespace svxform
return 0;
}
// -----------------------------------------------------------------------
- XFormsPage* DataNavigatorWindow::GetCurrentPage( USHORT& rCurId )
+ XFormsPage* DataNavigatorWindow::GetCurrentPage( sal_uInt16& rCurId )
{
rCurId = m_aTabCtrl.GetCurPageId();
XFormsPage* pPage = NULL;
@@ -2048,7 +2048,7 @@ namespace svxform
if ( rCurId > TID_INSTANCE )
{
- USHORT nPos = m_aTabCtrl.GetPagePos( rCurId );
+ sal_uInt16 nPos = m_aTabCtrl.GetPagePos( rCurId );
if ( HasFirstInstancePage() && nPos > 0 )
nPos--;
if ( m_aPageList.size() > nPos )
@@ -2129,8 +2129,8 @@ namespace svxform
Reference< css::xforms::XModel > xFormsModel;
if ( aAny >>= xFormsModel )
{
- USHORT nPagePos = TAB_PAGE_NOTFOUND;
- USHORT nId = 0;
+ sal_uInt16 nPagePos = TAB_PAGE_NOTFOUND;
+ sal_uInt16 nId = 0;
XFormsPage* pPage = GetCurrentPage( nId );
DBG_ASSERT( pPage, "DataNavigatorWindow::SetPageModel(): no page" );
if ( nId >= TID_INSTANCE )
@@ -2243,7 +2243,7 @@ namespace svxform
}
}
- USHORT nPageId = GetNewPageId();
+ sal_uInt16 nPageId = GetNewPageId();
if ( sInstName.getLength() == 0 )
{
DBG_ERRORFILE( "DataNavigatorWindow::CreateInstancePage(): instance without name" );
@@ -2261,9 +2261,9 @@ namespace svxform
}
//------------------------------------------------------------------------
- USHORT DataNavigatorWindow::GetNewPageId() const
+ sal_uInt16 DataNavigatorWindow::GetNewPageId() const
{
- USHORT i, nMax = 0, nCount = m_aTabCtrl.GetPageCount();
+ sal_uInt16 i, nMax = 0, nCount = m_aTabCtrl.GetPageCount();
for ( i = 0; i < nCount; ++i )
{
if ( nMax < m_aTabCtrl.GetPageId(i) )
@@ -2599,7 +2599,7 @@ namespace svxform
sPropName = PN_READONLY_EXPR;
else if ( &m_aCalculateCB == pBox )
sPropName = PN_CALCULATE_EXPR;
- bool bIsChecked = ( pBox->IsChecked() != FALSE );
+ bool bIsChecked = ( pBox->IsChecked() != sal_False );
m_xTempBinding->getPropertyValue( sPropName ) >>= sTemp;
if ( bIsChecked && sTemp.getLength() == 0 )
sTemp = TRUE_VALUE;
@@ -2891,19 +2891,19 @@ namespace svxform
{
if ( ( m_xTempBinding->getPropertyValue( PN_REQUIRED_EXPR ) >>= sTemp )
&& sTemp.getLength() > 0 )
- m_aRequiredCB.Check( TRUE );
+ m_aRequiredCB.Check( sal_True );
if ( ( m_xTempBinding->getPropertyValue( PN_RELEVANT_EXPR ) >>= sTemp )
&& sTemp.getLength() > 0 )
- m_aRelevantCB.Check( TRUE );
+ m_aRelevantCB.Check( sal_True );
if ( ( m_xTempBinding->getPropertyValue( PN_CONSTRAINT_EXPR ) >>= sTemp )
&& sTemp.getLength() > 0 )
- m_aConstraintCB.Check( TRUE );
+ m_aConstraintCB.Check( sal_True );
if ( ( m_xTempBinding->getPropertyValue( PN_READONLY_EXPR ) >>= sTemp )
&& sTemp.getLength() > 0 )
- m_aReadonlyCB.Check( TRUE );
+ m_aReadonlyCB.Check( sal_True );
if ( ( m_xTempBinding->getPropertyValue( PN_CALCULATE_EXPR ) >>= sTemp )
&& sTemp.getLength() > 0 )
- m_aCalculateCB.Check( TRUE );
+ m_aCalculateCB.Check( sal_True );
}
catch ( Exception& )
{
@@ -2973,7 +2973,7 @@ namespace svxform
rtl::OUString sTemp;
if ( m_xTempBinding->getPropertyValue( PN_BINDING_TYPE ) >>= sTemp )
{
- USHORT nPos = m_aDataTypeLB.GetEntryPos( String( sTemp ) );
+ sal_uInt16 nPos = m_aDataTypeLB.GetEntryPos( String( sTemp ) );
if ( LISTBOX_ENTRY_NOTFOUND == nPos )
nPos = m_aDataTypeLB.InsertEntry( sTemp );
m_aDataTypeLB.SelectEntryPos( nPos );
@@ -3208,7 +3208,7 @@ namespace svxform
//------------------------------------------------------------------------
IMPL_LINK( NamespaceItemDialog, SelectHdl, SvxSimpleTable *, EMPTYARG )
{
- BOOL bEnable = ( m_aNamespacesList.FirstSelected() != NULL );
+ sal_Bool bEnable = ( m_aNamespacesList.FirstSelected() != NULL );
m_aEditNamespaceBtn.Enable( bEnable );
m_aDeleteNamespaceBtn.Enable( bEnable );
@@ -3597,7 +3597,7 @@ namespace svxform
m_xSubmission->getPropertyValue( PN_SUBMISSION_METHOD ) >>= sTemp;
sTemp = lcl_MethodString::get().toUI( sTemp );
- USHORT nPos = m_aMethodLB.GetEntryPos( String( sTemp ) );
+ sal_uInt16 nPos = m_aMethodLB.GetEntryPos( String( sTemp ) );
if ( LISTBOX_ENTRY_NOTFOUND == nPos )
nPos = m_aMethodLB.InsertEntry( sTemp );
m_aMethodLB.SelectEntryPos( nPos );
diff --git a/svx/source/form/dbtoolsclient.cxx b/svx/source/form/dbtoolsclient.cxx
index 3c59ac47912f..6cc874112e94 100644
--- a/svx/source/form/dbtoolsclient.cxx
+++ b/svx/source/form/dbtoolsclient.cxx
@@ -61,7 +61,7 @@ namespace svxform
//--------------------------------------------------------------------
ODbtoolsClient::ODbtoolsClient()
{
- m_bCreateAlready = FALSE;
+ m_bCreateAlready = sal_False;
}
//--------------------------------------------------------------------
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 3b910652a96b..d9f64d068cbb 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -1268,7 +1268,7 @@ sal_Bool FmFilterNavigator::EditedEntry( SvLBoxEntry* pEntry, const XubString& r
if (aText.Len() == 0)
{
// deleting the entry asynchron
- ULONG nEvent;
+ sal_uLong nEvent;
PostUserEvent(nEvent, LINK(this, FmFilterNavigator, OnRemove), pEntry);
}
else
@@ -1922,7 +1922,7 @@ void FmFilterNavigator::DeleteSelection()
}
// Remove the selection
- SelectAll(FALSE);
+ SelectAll(sal_False);
for (::std::vector<SvLBoxEntry*>::reverse_iterator i = aEntryList.rbegin();
// link problems with operator ==
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index 039c3361491d..dc6a141e45e9 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -286,7 +286,7 @@ void FmEntryData::Clear()
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmEntryData::Clear" );
for (;;)
{
- FmEntryData* pEntryData = GetChildList()->Remove(ULONG(0));
+ FmEntryData* pEntryData = GetChildList()->Remove(sal_uLong(0));
if (pEntryData == NULL)
break;
delete pEntryData;
diff --git a/svx/source/form/fmmodel.cxx b/svx/source/form/fmmodel.cxx
index a10f7a40da84..3c4c3debcc82 100644
--- a/svx/source/form/fmmodel.cxx
+++ b/svx/source/form/fmmodel.cxx
@@ -199,7 +199,7 @@ void FmFormModel::InsertPage(SdrPage* pPage, sal_uInt16 nPos)
|* MovePage
|*
\************************************************************************/
-void FmFormModel::MovePage( USHORT nPgNum, USHORT nNewPos )
+void FmFormModel::MovePage( sal_uInt16 nPgNum, sal_uInt16 nNewPos )
{
#ifndef SVX_LIGHT
m_pImpl->bMovingPage = sal_True;
diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx
index 1c7da93dfd95..2b13f2a90bf0 100644
--- a/svx/source/form/fmobjfac.cxx
+++ b/svx/source/form/fmobjfac.cxx
@@ -75,7 +75,7 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::svxform;
-static BOOL bInit = FALSE;
+static sal_Bool bInit = sal_False;
/*************************************************************************
|*
@@ -111,7 +111,7 @@ FmFormObjFactory::FmFormObjFactory()
FmFormShell::RegisterInterface(0);
ImplSmartRegisterUnoServices();
- bInit = TRUE;
+ bInit = sal_True;
}
}
diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx
index 2c2999ee34ea..480bc5678eaf 100644
--- a/svx/source/form/fmpage.cxx
+++ b/svx/source/form/fmpage.cxx
@@ -171,7 +171,7 @@ SdrPage* FmFormPage::Clone() const
}
//------------------------------------------------------------------
-void FmFormPage::InsertObject(SdrObject* pObj, ULONG nPos,
+void FmFormPage::InsertObject(SdrObject* pObj, sal_uLong nPos,
const SdrInsertReason* pReason)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFormPage::InsertObject" );
@@ -270,7 +270,7 @@ sal_Bool FmFormPage::RequestHelp( Window* pWindow, SdrView* pView,
}
//------------------------------------------------------------------
-SdrObject* FmFormPage::RemoveObject(ULONG nObjNum)
+SdrObject* FmFormPage::RemoveObject(sal_uLong nObjNum)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFormPage::RemoveObject" );
SdrObject* pObj = SdrPage::RemoveObject(nObjNum);
diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx
index 154999333296..3e8aa88a2612 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -28,7 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svx.hxx"
#include "fmscriptingenv.hxx"
-#include <svx/fmmodel.hxx>
+#include "svx/fmmodel.hxx"
/** === begin UNO includes === **/
#include <com/sun/star/lang/IllegalArgumentException.hpp>
@@ -37,6 +37,7 @@
#include <com/sun/star/reflection/XInterfaceMethodTypeDescription.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
/** === end UNO includes === **/
+
#include <tools/diagnose_ex.h>
#include <cppuhelper/implbase1.hxx>
#include <comphelper/implementationreference.hxx>
@@ -45,6 +46,8 @@
#include <vcl/svapp.hxx>
#include <vos/mutex.hxx>
#include <sfx2/objsh.hxx>
+#include <sfx2/app.hxx>
+#include <basic/basmgr.hxx>
#include <boost/shared_ptr.hpp>
@@ -416,60 +419,6 @@ namespace svxform
m_rObjectShell.CallXScript( m_sScriptCode, _rArguments, _rSynchronousResult, aOutArgsIndex, aOutArgs );
}
-
- //................................................................
- //. QualifiedBasicScript
- //................................................................
- class QualifiedBasicScript : public IScript
- {
- SfxObjectShell& m_rObjectShell;
- const ::rtl::OUString m_sMacroLocation;
- const ::rtl::OUString m_sScriptCode;
-
- public:
- QualifiedBasicScript( SfxObjectShell& _rObjectShell, const ::rtl::OUString& _rLocation, const ::rtl::OUString& _rScriptCode )
- :m_rObjectShell( _rObjectShell )
- ,m_sMacroLocation( _rLocation )
- ,m_sScriptCode( _rScriptCode )
- {
- }
-
- // IScript
- virtual void invoke( const Sequence< Any >& _rArguments, Any& _rSynchronousResult );
- };
-
- //................................................................
- void QualifiedBasicScript::invoke( const Sequence< Any >& _rArguments, Any& _rSynchronousResult )
- {
- m_rObjectShell.CallStarBasicScript( m_sScriptCode, m_sMacroLocation,
- &_rArguments, &_rSynchronousResult );
- }
-
- //................................................................
- //. UnqualifiedBasicScript
- //................................................................
- class UnqualifiedBasicScript : public IScript
- {
- SfxObjectShell& m_rObjectShell;
- const ::rtl::OUString m_sScriptCode;
-
- public:
- UnqualifiedBasicScript( SfxObjectShell& _rObjectShell, const ::rtl::OUString& _rScriptCode )
- :m_rObjectShell( _rObjectShell )
- ,m_sScriptCode( _rScriptCode )
- {
- }
-
- // IScript
- virtual void invoke( const Sequence< Any >& _rArguments, Any& _rSynchronousResult );
- };
-
- //................................................................
- void UnqualifiedBasicScript::invoke( const Sequence< Any >& _rArguments, Any& _rSynchronousResult )
- {
- m_rObjectShell.CallScript( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StarBasic" ) ), m_sScriptCode,
- &_rArguments, &_rSynchronousResult );
- }
}
//--------------------------------------------------------------------
@@ -481,6 +430,7 @@ namespace svxform
if ( m_bDisposed )
return;
+ // SfxObjectShellRef is good here since the model controls the lifetime of the object
SfxObjectShellRef xObjectShell = m_rFormModel.GetObjectShell();
if( !xObjectShell.Is() )
return;
@@ -513,14 +463,24 @@ namespace svxform
sScriptCode = sScriptCode.copy( nPrefixLen + 1 );
}
- if ( sMacroLocation.getLength() )
- { // we have a StarBasic macro with fully-qualified macro location
- pScript.reset( new QualifiedBasicScript( *xObjectShell, sMacroLocation, sScriptCode ) );
- }
- else
- { // we have a StarBasic macro without qualified location - let the object shell gues ....
- pScript.reset( new UnqualifiedBasicScript( *xObjectShell, sScriptCode ) );
+ if ( !sMacroLocation.getLength() )
+ {
+ // legacy format: use the app-wide Basic, if it has a respective method, otherwise fall back to the doc's Basic
+ if ( SFX_APP()->GetBasicManager()->HasMacro( sScriptCode ) )
+ sMacroLocation = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "application" ) );
+ else
+ sMacroLocation = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "document" ) );
}
+
+ ::rtl::OUStringBuffer aScriptURI;
+ aScriptURI.appendAscii( "vnd.sun.star.script:" );
+ aScriptURI.append( sScriptCode );
+ aScriptURI.appendAscii( "?language=Basic" );
+ aScriptURI.appendAscii( "&location=" );
+ aScriptURI.append( sMacroLocation );
+
+ const ::rtl::OUString sScriptURI( aScriptURI.makeStringAndClear() );
+ pScript.reset( new NewStyleUNOScript( *xObjectShell, sScriptURI ) );
}
OSL_ENSURE( pScript.get(), "FormScriptingEnvironment::doFireScriptEvent: no script to execute!" );
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index e767f7c0b112..112b47b1107e 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -868,7 +868,7 @@ void FmFormShell::Execute(SfxRequest &rReq)
rReq.Done();
// initially open the filter navigator, the whole form based filter is pretty useless without it
- SfxBoolItem aIdentifierItem( SID_FM_FILTER_NAVIGATOR, TRUE );
+ SfxBoolItem aIdentifierItem( SID_FM_FILTER_NAVIGATOR, sal_True );
GetViewShell()->GetViewFrame()->GetDispatcher()->Execute( SID_FM_FILTER_NAVIGATOR, SFX_CALLMODE_ASYNCHRON,
&aIdentifierItem, NULL );
} break;
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 7a705dfa4aa5..2ff40610fa77 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -1030,7 +1030,7 @@ void FmXFormShell::InvalidateSlot( sal_Int16 nId, sal_Bool bWithId )
if (m_nLockSlotInvalidation)
{
m_arrInvalidSlots.Insert(nId, m_arrInvalidSlots.Count());
- BYTE nFlags = ( bWithId ? 0x01 : 0 );
+ sal_uInt8 nFlags = ( bWithId ? 0x01 : 0 );
m_arrInvalidSlots_Flags.push_back(nFlags);
}
else
@@ -1070,7 +1070,7 @@ IMPL_LINK(FmXFormShell, OnInvalidateSlots, void*, EMPTYARG)
DBG_ASSERT(m_arrInvalidSlots.Count() == m_arrInvalidSlots_Flags.size(),
"FmXFormShell::OnInvalidateSlots : inconsistent slot arrays !");
- BYTE nFlags;
+ sal_uInt8 nFlags;
for (sal_Int16 i=0; i<m_arrInvalidSlots.Count(); ++i)
{
nFlags = m_arrInvalidSlots_Flags[i];
@@ -1111,7 +1111,7 @@ void FmXFormShell::ForceUpdateSelection(sal_Bool bAllowInvalidation)
PopupMenu* FmXFormShell::GetConversionMenu()
{
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
- BOOL bIsHiContrastMode = rSettings.GetHighContrastMode();
+ sal_Bool bIsHiContrastMode = rSettings.GetHighContrastMode();
PopupMenu* pNewMenu = new PopupMenu(SVX_RES( RID_FMSHELL_CONVERSIONMENU ));
@@ -4226,10 +4226,10 @@ void ControlConversionMenuController::StateChanged(sal_uInt16 nSID, SfxItemState
// We can't simply re-insert the item because we have a clear order for all the our items.
// So first we have to determine the position of the item to insert.
PopupMenu* pSource = FmXFormShell::GetConversionMenu();
- USHORT nSourcePos = pSource->GetItemPos(nSID);
+ sal_uInt16 nSourcePos = pSource->GetItemPos(nSID);
DBG_ASSERT(nSourcePos != MENU_ITEM_NOTFOUND, "ControlConversionMenuController::StateChanged : FmXFormShell supplied an invalid menu !");
- USHORT nPrevInSource = nSourcePos;
- USHORT nPrevInConversion = MENU_ITEM_NOTFOUND;
+ sal_uInt16 nPrevInSource = nSourcePos;
+ sal_uInt16 nPrevInConversion = MENU_ITEM_NOTFOUND;
while (nPrevInSource>0)
{
sal_Int16 nPrevId = pSource->GetItemId(--nPrevInSource);
@@ -4241,7 +4241,7 @@ void ControlConversionMenuController::StateChanged(sal_uInt16 nSID, SfxItemState
}
if (MENU_ITEM_NOTFOUND == nPrevInConversion)
// none of the items which precede the nSID-slot in the source menu are present in our conversion menu
- nPrevInConversion = sal::static_int_cast< USHORT >(-1); // put the item at the first position
+ nPrevInConversion = sal::static_int_cast< sal_uInt16 >(-1); // put the item at the first position
m_pConversionMenu->InsertItem(nSID, pSource->GetItemText(nSID), pSource->GetItemBits(nSID), ++nPrevInConversion);
m_pConversionMenu->SetItemImage(nSID, pSource->GetItemImage(nSID));
m_pConversionMenu->SetHelpId(nSID, pSource->GetHelpId(nSID));
diff --git a/svx/source/form/fmtextcontroldialogs.cxx b/svx/source/form/fmtextcontroldialogs.cxx
index d758b5622e0b..9be7d4881f61 100644
--- a/svx/source/form/fmtextcontroldialogs.cxx
+++ b/svx/source/form/fmtextcontroldialogs.cxx
@@ -76,7 +76,7 @@ namespace svx
}
//--------------------------------------------------------------------
- void TextControlCharAttribDialog::PageCreated( USHORT _nId, SfxTabPage& _rPage )
+ void TextControlCharAttribDialog::PageCreated( sal_uInt16 _nId, SfxTabPage& _rPage )
{
SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index 19ca20dd7983..e2b959d013eb 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -94,7 +94,7 @@ namespace svx
using namespace ::com::sun::star::container;
//====================================================================
- typedef USHORT WhichId;
+ typedef sal_uInt16 WhichId;
//====================================================================
static SfxSlotId pTextControlSlots[] =
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index e63325f710e9..eee61c5c2dee 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -130,6 +130,8 @@ private:
{
Reference< XMultiComponentFactory > xMFac(
xCtx->getServiceManager(), UNO_QUERY );
+
+ // SfxObjectShellRef is good here since the model controls the lifetime of the shell
SfxObjectShellRef xObjSh = pModel->GetObjectShell();
Reference< XMultiServiceFactory > xDocFac;
if ( xObjSh.Is() )
@@ -150,6 +152,7 @@ private:
{
try
{
+ // SfxObjectShellRef is good here since the model controls the lifetime of the shell
SfxObjectShellRef xObjSh = pModel->GetObjectShell();
if ( xObjSh.Is() && m_vbaListener.is() )
{
@@ -177,8 +180,8 @@ private:
//------------------------------------------------------------------------------
struct PropertyInfo
{
- BOOL bIsTransientOrReadOnly : 1; // the property is transient or read-only, thus we need no undo action for it
- BOOL bIsValueProperty : 1; // the property is the special value property, thus it may be handled
+ sal_Bool bIsTransientOrReadOnly : 1; // the property is transient or read-only, thus we need no undo action for it
+ sal_Bool bIsValueProperty : 1; // the property is the special value property, thus it may be handled
// as if it's transient or persistent
};
@@ -187,11 +190,11 @@ struct PropertySetInfo
DECLARE_STL_USTRINGACCESS_MAP(PropertyInfo, AllProperties);
AllProperties aProps; // all properties of this set which we know so far
- BOOL bHasEmptyControlSource; // sal_True -> the set has a DataField property, and the current value is an empty string
+ sal_Bool bHasEmptyControlSource; // sal_True -> the set has a DataField property, and the current value is an empty string
// sal_False -> the set has _no_ such property or it's value isn't empty
};
-BOOL operator < (const Reference< XPropertySet >& lhs,
+sal_Bool operator < (const Reference< XPropertySet >& lhs,
const Reference< XPropertySet >& rhs)
{
return lhs.get() < rhs.get();
@@ -668,7 +671,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt)
PropertyInfo aNewEntry;
// the attributes
- INT32 nAttributes = xSet->getPropertySetInfo()->getPropertyByName(evt.PropertyName).Attributes;
+ sal_Int32 nAttributes = xSet->getPropertySetInfo()->getPropertyByName(evt.PropertyName).Attributes;
aNewEntry.bIsTransientOrReadOnly = ((nAttributes & PropertyAttribute::READONLY) != 0) || ((nAttributes & PropertyAttribute::TRANSIENT) != 0);
// check if it is the special "DataFieldProperty"
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index f9980284993d..3ab15471e4fd 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -46,7 +46,6 @@
#include <sfx2/bindings.hxx>
#include <sfx2/dispatch.hxx>
#include <basic/sbuno.hxx>
-#include <sfx2/macrconf.hxx>
#include <basic/sbx.hxx>
#include "fmitems.hxx"
#include "fmobj.hxx"
@@ -187,7 +186,7 @@ void FmFormView::MarkListHasChanged()
pImpl->m_xWindow->removeFocusListener(pImpl);
pImpl->m_xWindow = NULL;
}
- SetMoveOutside(FALSE);
+ SetMoveOutside(sal_False);
//OLMRefreshAllIAOManagers();
}
@@ -504,9 +503,9 @@ void FmFormView::EndCompleteRedraw( SdrPaintWindow& rPaintWindow, bool bPaintFor
}
// -----------------------------------------------------------------------------
-BOOL FmFormView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
+sal_Bool FmFormView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
{
- BOOL bDone = FALSE;
+ sal_Bool bDone = sal_False;
const KeyCode& rKeyCode = rKEvt.GetKeyCode();
if ( IsDesignMode()
&& rKeyCode.GetCode() == KEY_RETURN
@@ -529,10 +528,10 @@ BOOL FmFormView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
pImpl->m_xWindow = xWindow;
// add as listener to get notified when ESC will be pressed inside the grid
pImpl->m_xWindow->addFocusListener(pImpl);
- SetMoveOutside(TRUE);
+ SetMoveOutside(sal_True);
//OLMRefreshAllIAOManagers();
xWindow->setFocus();
- bDone = TRUE;
+ bDone = sal_True;
}
}
}
@@ -565,9 +564,9 @@ sal_Bool FmFormView::checkUnMarkAll(const Reference< XInterface >& _xSource)
}
// -----------------------------------------------------------------------------
-BOOL FmFormView::MouseButtonDown( const MouseEvent& _rMEvt, Window* _pWin )
+sal_Bool FmFormView::MouseButtonDown( const MouseEvent& _rMEvt, Window* _pWin )
{
- BOOL bReturn = E3dView::MouseButtonDown( _rMEvt, _pWin );
+ sal_Bool bReturn = E3dView::MouseButtonDown( _rMEvt, _pWin );
if ( pFormShell && pFormShell->GetImpl() )
{
@@ -604,7 +603,7 @@ FmFormObj* FmFormView::getMarkedGrid() const
// -----------------------------------------------------------------------------
void FmFormView::createControlLabelPair( OutputDevice* _pOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM,
const Reference< XPropertySet >& _rxField, const Reference< XNumberFormats >& _rxNumberFormats,
- sal_uInt16 _nControlObjectID, const ::rtl::OUString& _rFieldPostfix, UINT32 _nInventor, UINT16 _nLabelObjectID,
+ sal_uInt16 _nControlObjectID, const ::rtl::OUString& _rFieldPostfix, sal_uInt32 _nInventor, sal_uInt16 _nLabelObjectID,
SdrPage* _pLabelPage, SdrPage* _pControlPage, SdrModel* _pModel, SdrUnoObj*& _rpLabel, SdrUnoObj*& _rpControl )
{
FmXFormView::createControlLabelPair(
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 8e0f6b2a261a..d2b6d6cbded4 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -768,7 +768,7 @@ void FmXFormView::Activate(sal_Bool bSync)
}
//------------------------------------------------------------------------------
-void FmXFormView::Deactivate(BOOL bDeactivateController)
+void FmXFormView::Deactivate(sal_Bool bDeactivateController)
{
if (m_nActivationEvent)
{
@@ -1518,7 +1518,7 @@ bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXO
bool FmXFormView::createControlLabelPair( const ::comphelper::ComponentContext& _rContext,
OutputDevice& _rOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM, const Reference< XPropertySet >& _rxField,
const Reference< XNumberFormats >& _rxNumberFormats, sal_uInt16 _nControlObjectID,
- const ::rtl::OUString& _rFieldPostfix, UINT32 _nInventor, UINT16 _nLabelObjectID,
+ const ::rtl::OUString& _rFieldPostfix, sal_uInt32 _nInventor, sal_uInt16 _nLabelObjectID,
SdrPage* _pLabelPage, SdrPage* _pControlPage, SdrModel* _pModel, SdrUnoObj*& _rpLabel, SdrUnoObj*& _rpControl)
{
sal_Int32 nDataType = 0;
@@ -1690,8 +1690,8 @@ void FmXFormView::ObjectRemovedInAliveMode( const SdrObject* pObject )
// muss ich es jetzt da rausnehmen, da ich sonst beim Zurueckschalten versuche, die Markierung wieder zu setzen
// (interesanterweise geht das nur bei gruppierten Objekten schief (beim Zugriff auf deren ObjList GPF), nicht bei einzelnen)
- ULONG nCount = m_aMark.GetMarkCount();
- for (ULONG i = 0; i < nCount; ++i)
+ sal_uIntPtr nCount = m_aMark.GetMarkCount();
+ for (sal_uIntPtr i = 0; i < nCount; ++i)
{
SdrMark* pMark = m_aMark.GetMark(i);
SdrObject* pCurrent = pMark->GetMarkedSdrObj();
@@ -1740,8 +1740,8 @@ void FmXFormView::saveMarkList( sal_Bool _bSmartUnmark )
m_aMark = m_pView->GetMarkedObjectList();
if ( _bSmartUnmark )
{
- ULONG nCount = m_aMark.GetMarkCount( );
- for ( ULONG i = 0; i < nCount; ++i )
+ sal_uIntPtr nCount = m_aMark.GetMarkCount( );
+ for ( sal_uIntPtr i = 0; i < nCount; ++i )
{
SdrMark* pMark = m_aMark.GetMark(i);
SdrObject* pObj = pMark->GetMarkedSdrObj();
@@ -1807,15 +1807,15 @@ void FmXFormView::restoreMarkList( SdrMarkList& _rRestoredMarkList )
sal_Bool bMisMatch = sal_False;
// loop through all current marks
- ULONG nCurrentCount = rCurrentList.GetMarkCount();
- for ( ULONG i=0; i<nCurrentCount&& !bMisMatch; ++i )
+ sal_uIntPtr nCurrentCount = rCurrentList.GetMarkCount();
+ for ( sal_uIntPtr i=0; i<nCurrentCount&& !bMisMatch; ++i )
{
const SdrObject* pCurrentMarked = rCurrentList.GetMark( i )->GetMarkedSdrObj();
// loop through all saved marks, check for equality
sal_Bool bFound = sal_False;
- ULONG nSavedCount = m_aMark.GetMarkCount();
- for ( ULONG j=0; j<nSavedCount && !bFound; ++j )
+ sal_uIntPtr nSavedCount = m_aMark.GetMarkCount();
+ for ( sal_uIntPtr j=0; j<nSavedCount && !bFound; ++j )
{
if ( m_aMark.GetMark( j )->GetMarkedSdrObj() == pCurrentMarked )
bFound = sal_True;
@@ -1840,8 +1840,8 @@ void FmXFormView::restoreMarkList( SdrMarkList& _rRestoredMarkList )
sal_Bool bFound = sal_True;
// gibt es noch alle Objecte
- ULONG nCount = m_aMark.GetMarkCount();
- for (ULONG i = 0; i < nCount && bFound; i++)
+ sal_uIntPtr nCount = m_aMark.GetMarkCount();
+ for (sal_uIntPtr i = 0; i < nCount && bFound; i++)
{
SdrMark* pMark = m_aMark.GetMark(i);
SdrObject* pObj = pMark->GetMarkedSdrObj();
@@ -1862,7 +1862,7 @@ void FmXFormView::restoreMarkList( SdrMarkList& _rRestoredMarkList )
// Das LastObject auswerten
if (nCount) // Objecte jetzt Markieren
{
- for (ULONG i = 0; i < nCount; i++)
+ for (sal_uIntPtr i = 0; i < nCount; i++)
{
SdrMark* pMark = m_aMark.GetMark(i);
SdrObject* pObj = pMark->GetMarkedSdrObj();
@@ -1882,7 +1882,7 @@ void SAL_CALL FmXFormView::focusGained( const FocusEvent& /*e*/ ) throw (Runtime
{
if ( m_xWindow.is() && m_pView )
{
- m_pView->SetMoveOutside( TRUE, FmFormView::ImplAccess() );
+ m_pView->SetMoveOutside( sal_True, FmFormView::ImplAccess() );
}
}
// -----------------------------------------------------------------------------
@@ -1892,7 +1892,7 @@ void SAL_CALL FmXFormView::focusLost( const FocusEvent& /*e*/ ) throw (RuntimeEx
// so we can not remove us as focus listener
if ( m_xWindow.is() && m_pView )
{
- m_pView->SetMoveOutside( FALSE, FmFormView::ImplAccess() );
+ m_pView->SetMoveOutside( sal_False, FmFormView::ImplAccess() );
}
}
// -----------------------------------------------------------------------------
@@ -1903,7 +1903,7 @@ void FmXFormView::removeGridWindowListening()
m_xWindow->removeFocusListener(this);
if ( m_pView )
{
- m_pView->SetMoveOutside( FALSE, FmFormView::ImplAccess() );
+ m_pView->SetMoveOutside( sal_False, FmFormView::ImplAccess() );
}
m_xWindow = NULL;
}
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 7087e3d6793f..528661d2abe4 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -81,7 +81,7 @@
#include <comphelper/property.hxx>
#include <comphelper/sequence.hxx>
#include <comphelper/uno3.hxx>
-#include <comphelper/scopeguard.hxx>
+#include <comphelper/flagguard.hxx>
#include <cppuhelper/queryinterface.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <toolkit/controls/unocontrol.hxx>
diff --git a/svx/source/form/formtoolbars.cxx b/svx/source/form/formtoolbars.cxx
index b98e63fb2bd1..739e9788c64b 100644
--- a/svx/source/form/formtoolbars.cxx
+++ b/svx/source/form/formtoolbars.cxx
@@ -60,7 +60,7 @@ namespace svxform
}
//--------------------------------------------------------------------
- void FormToolboxes::toggleToolbox( USHORT _nSlotId ) const
+ void FormToolboxes::toggleToolbox( sal_uInt16 _nSlotId ) const
{
try
{
@@ -88,14 +88,14 @@ namespace svxform
}
//--------------------------------------------------------------------
- bool FormToolboxes::isToolboxVisible( USHORT _nSlotId ) const
+ bool FormToolboxes::isToolboxVisible( sal_uInt16 _nSlotId ) const
{
return m_xLayouter.is() && m_xLayouter->isElementVisible(
getToolboxResourceName( _nSlotId ) );
}
//--------------------------------------------------------------------
- ::rtl::OUString FormToolboxes::getToolboxResourceName( USHORT _nSlotId ) const
+ ::rtl::OUString FormToolboxes::getToolboxResourceName( sal_uInt16 _nSlotId ) const
{
OSL_ENSURE( ( _nSlotId == SID_FM_MORE_CONTROLS ) || ( _nSlotId == SID_FM_FORM_DESIGN_TOOLS ) || ( _nSlotId == SID_FM_CONFIG ),
"FormToolboxes::getToolboxResourceName: unsupported slot!" );
diff --git a/svx/source/form/makefile.mk b/svx/source/form/makefile.mk
deleted file mode 100644
index d6dc1bd65357..000000000000
--- a/svx/source/form/makefile.mk
+++ /dev/null
@@ -1,119 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svx
-TARGET=form
-LIBTARGET=NO
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(ENABLE_VBA)"=="YES"
- CDEFS+=-DENABLE_VBA
-.ENDIF
-
-SRS1NAME=form
-SRC1FILES= \
- fmexpl.src \
- filtnav.src \
- fmstring.src \
- formshell.src \
- datanavi.src
-
-LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
-LIB1OBJFILES= \
- $(SLO)$/formtoolbars.obj \
- $(SLO)$/fmdocumentclassification.obj \
- $(SLO)$/fmcontrolbordermanager.obj \
- $(SLO)$/fmcontrollayout.obj \
- $(SLO)$/fmtextcontroldialogs.obj \
- $(SLO)$/fmtextcontrolfeature.obj \
- $(SLO)$/fmtextcontrolshell.obj \
- $(SLO)$/ParseContext.obj \
- $(SLO)$/typeconversionclient.obj \
- $(SLO)$/dbtoolsclient.obj \
- $(SLO)$/sqlparserclient.obj \
- $(SLO)$/dataaccessdescriptor.obj \
- $(SLO)$/fmpage.obj \
- $(SLO)$/fmundo.obj \
- $(SLO)$/fmmodel.obj \
- $(SLO)$/navigatortree.obj \
- $(SLO)$/navigatortreemodel.obj \
- $(SLO)$/fmexpl.obj \
- $(SLO)$/formcontroller.obj \
- $(SLO)$/fmpgeimp.obj \
- $(SLO)$/fmvwimp.obj \
- $(SLO)$/fmdpage.obj \
- $(SLO)$/fmitems.obj \
- $(SLO)$/fmobj.obj \
- $(SLO)$/fmdmod.obj \
- $(SLO)$/fmservs.obj \
- $(SLO)$/typemap.obj \
- $(SLO)$/fmexch.obj \
- $(SLO)$/fmtools.obj \
- $(SLO)$/fmshimp.obj \
- $(SLO)$/fmshell.obj \
- $(SLO)$/fmview.obj \
- $(SLO)$/sdbdatacolumn.obj \
- $(SLO)$/formcontrolling.obj \
- $(SLO)$/formfeaturedispatcher.obj \
- $(SLO)$/formdispatchinterceptor.obj \
- $(SLO)$/datanavi.obj \
- $(SLO)$/xfm_addcondition.obj \
- $(SLO)$/datalistener.obj \
- $(SLO)$/fmscriptingenv.obj \
- $(SLO)$/stringlistresource.obj \
- $(SLO)$/delayedevent.obj \
- $(SLO)$/formcontrolfactory.obj \
- $(SLO)$/legacyformcontroller.obj
-
-LIB2TARGET= $(SLB)$/$(TARGET).lib
-LIB2OBJFILES= \
- $(SLO)$/dbcharsethelper.obj \
- $(SLO)$/fmPropBrw.obj \
- $(SLO)$/tbxform.obj \
- $(SLO)$/fmobjfac.obj \
- $(SLO)$/fmsrccfg.obj \
- $(SLO)$/tabwin.obj \
- $(SLO)$/filtnav.obj \
- $(SLO)$/fmsrcimp.obj \
- $(SLO)$/databaselocationinput.obj
-
-SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES)
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index 78bbc7a533d9..362b4bba0faf 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -714,7 +714,7 @@ namespace svxform
}
//------------------------------------------------------------------------
- SvLBoxEntry* NavigatorTree::Insert( FmEntryData* pEntryData, ULONG nRelPos )
+ SvLBoxEntry* NavigatorTree::Insert( FmEntryData* pEntryData, sal_uIntPtr nRelPos )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::Insert" );
//////////////////////////////////////////////////////////////////////
@@ -782,7 +782,7 @@ namespace svxform
// beim eigentlichen Entfernen kann die Selection geaendert werden, da ich aber das SelectionHandling abgeschaltet
// habe, muss ich mich hinterher darum kuemmern
- ULONG nExpectedSelectionCount = GetSelectionCount();
+ sal_uIntPtr nExpectedSelectionCount = GetSelectionCount();
if( pEntry )
GetModel()->Remove( pEntry );
@@ -1760,7 +1760,7 @@ namespace svxform
// erstmal die PropertySet-Interfaces der Forms einsammeln
for ( sal_Int32 i = 0; i < m_nFormsSelected; ++i )
{
- FmFormData* pFormData = (FmFormData*)m_arrCurrentSelection.GetObject((USHORT)i)->GetUserData();
+ FmFormData* pFormData = (FmFormData*)m_arrCurrentSelection.GetObject((sal_uInt16)i)->GetUserData();
aSelection.insert( pFormData->GetPropertySet().get() );
}
}
@@ -1770,7 +1770,7 @@ namespace svxform
{ // ein MultiSet fuer die Properties der hidden controls
for ( sal_Int32 i = 0; i < m_nHiddenControls; ++i )
{
- FmEntryData* pEntryData = (FmEntryData*)m_arrCurrentSelection.GetObject((USHORT)i)->GetUserData();
+ FmEntryData* pEntryData = (FmEntryData*)m_arrCurrentSelection.GetObject((sal_uInt16)i)->GetUserData();
aSelection.insert( pEntryData->GetPropertySet().get() );
}
}
@@ -1802,7 +1802,7 @@ namespace svxform
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::DeleteSelection" );
// die Root darf ich natuerlich nicht mitloeschen
sal_Bool bRootSelected = IsSelected(m_pRootEntry);
- ULONG nSelectedEntries = GetSelectionCount();
+ sal_uIntPtr nSelectedEntries = GetSelectionCount();
if (bRootSelected && (nSelectedEntries > 1)) // die Root plus andere Elemente ?
Select(m_pRootEntry, sal_False); // ja -> die Root raus
@@ -1843,7 +1843,7 @@ namespace svxform
// then go on to the strucure. This means I have to delete the forms *after* the normal controls, so
// that during UNDO, they're restored in the proper order.
pFormShell->GetImpl()->EnableTrackProperties(sal_False);
- USHORT i;
+ sal_uInt16 i;
for (i = m_arrCurrentSelection.Count(); i>0; --i)
{
FmEntryData* pCurrent = (FmEntryData*)(m_arrCurrentSelection.GetObject(i - 1)->GetUserData());
@@ -2103,7 +2103,7 @@ namespace svxform
for (sal_uInt32 i=0; i<m_arrCurrentSelection.Count(); ++i)
{
- SvLBoxEntry* pSelectionLoop = m_arrCurrentSelection.GetObject((USHORT)i);
+ SvLBoxEntry* pSelectionLoop = m_arrCurrentSelection.GetObject((sal_uInt16)i);
// Bei Formselektion alle Controls dieser Form markieren
if (IsFormEntry(pSelectionLoop) && (pSelectionLoop != m_pRootEntry))
MarkViewObj((FmFormData*)pSelectionLoop->GetUserData(), sal_True, sal_False);
diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx
index 2065295006e9..bd788b731280 100644
--- a/svx/source/form/navigatortreemodel.cxx
+++ b/svx/source/form/navigatortreemodel.cxx
@@ -298,7 +298,7 @@ namespace svxform
}
//------------------------------------------------------------------------
- void NavigatorTreeModel::Insert(FmEntryData* pEntry, ULONG nRelPos, sal_Bool bAlterModel)
+ void NavigatorTreeModel::Insert(FmEntryData* pEntry, sal_uLong nRelPos, sal_Bool bAlterModel)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::Insert" );
if (IsListening(*m_pFormModel))
@@ -872,7 +872,7 @@ namespace svxform
FmNavRequestSelectHint rshRequestSelection;
sal_Bool bIsMixedSelection = sal_False;
- for (ULONG i=0; (i<mlMarked.GetMarkCount()) && !bIsMixedSelection; i++)
+ for (sal_uLong i=0; (i<mlMarked.GetMarkCount()) && !bIsMixedSelection; i++)
{
SdrObject* pobjCurrent = mlMarked.GetMark(i)->GetMarkedSdrObj();
bIsMixedSelection |= !InsertFormComponent(rshRequestSelection, pobjCurrent);
diff --git a/svx/source/form/stringlistresource.cxx b/svx/source/form/stringlistresource.cxx
index eb799e2b2927..06f8814a9721 100644
--- a/svx/source/form/stringlistresource.cxx
+++ b/svx/source/form/stringlistresource.cxx
@@ -50,7 +50,7 @@ namespace svx
StringListResource::StringListResource( const ResId& _rResId )
:Resource( _rResId )
{
- USHORT nLocalID = 1;
+ sal_uInt16 nLocalID = 1;
ResId aLocalID( nLocalID, *_rResId.GetResMgr() );
while ( IsAvailableRes( aLocalID.SetRT( RSC_STRING ) ) )
{
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index 37c102cb1954..d8bff05bf599 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -126,9 +126,9 @@ void lcl_addToList( SvTreeListBox& _rListBox, const uno::Reference< container::X
if ( xColumn->getPropertySetInfo()->hasPropertyByName(FM_PROP_LABEL) )
xColumn->getPropertyValue(FM_PROP_LABEL) >>= sLabel;
if ( sLabel.getLength() )
- _rListBox.InsertEntry( sLabel,NULL,FALSE,LIST_APPEND,new ColumnInfo(*pEntries,sLabel) );
+ _rListBox.InsertEntry( sLabel,NULL,sal_False,LIST_APPEND,new ColumnInfo(*pEntries,sLabel) );
else
- _rListBox.InsertEntry( *pEntries,NULL,FALSE,LIST_APPEND,new ColumnInfo(*pEntries,sLabel) );
+ _rListBox.InsertEntry( *pEntries,NULL,sal_False,LIST_APPEND,new ColumnInfo(*pEntries,sLabel) );
}
}
//==================================================================
@@ -165,7 +165,7 @@ sal_Int8 FmFieldWinListBox::ExecuteDrop( const ExecuteDropEvent& /*rEvt*/ )
}
//------------------------------------------------------------------------------
-BOOL FmFieldWinListBox::DoubleClickHdl()
+sal_Bool FmFieldWinListBox::DoubleClickHdl()
{
if ( pTabWin->createSelectionControls() )
return sal_True;
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index fb13eddd15f0..0bad14631355 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -81,7 +81,7 @@ SvxFmAbsRecWin::SvxFmAbsRecWin( Window* _pParent, SfxToolBoxControl* _pControlle
SetSizePixel( Size(70,19) );
SetDecimalDigits(0);
- SetStrictFormat(TRUE);
+ SetStrictFormat(sal_True);
}
// -----------------------------------------------------------------------
@@ -101,7 +101,7 @@ void SvxFmAbsRecWin::FirePosition( sal_Bool _bForce )
return;
}
- SfxInt32Item aPositionParam( FN_PARAM_1, static_cast<INT32>(nRecord) );
+ SfxInt32Item aPositionParam( FN_PARAM_1, static_cast<sal_Int32>(nRecord) );
Any a;
Sequence< PropertyValue > aArgs( 1 );
@@ -137,7 +137,7 @@ void SvxFmAbsRecWin::KeyInput( const KeyEvent& rKeyEvent )
struct MapSlotToCmd
{
- USHORT nSlotId;
+ sal_uInt16 nSlotId;
const char* pCommand;
};
@@ -170,7 +170,7 @@ static MapSlotToCmd SlotToCommands[] =
SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlConfig, SfxUInt16Item );
//-----------------------------------------------------------------------
-SvxFmTbxCtlConfig::SvxFmTbxCtlConfig( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+SvxFmTbxCtlConfig::SvxFmTbxCtlConfig( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
: SfxToolBoxControl( nSlotId, nId, rTbx )
,nLastSlot( 0 )
{
@@ -178,11 +178,11 @@ SvxFmTbxCtlConfig::SvxFmTbxCtlConfig( USHORT nSlotId, USHORT nId, ToolBox& rTbx
}
//-----------------------------------------------------------------------
-void SvxFmTbxCtlConfig::StateChanged(USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+void SvxFmTbxCtlConfig::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
{
if (nSID == SID_FM_CONFIG)
{
- UINT16 nSlot = 0;
+ sal_uInt16 nSlot = 0;
if (eState >= SFX_ITEM_AVAILABLE)
nSlot = ((SfxUInt16Item*)pState)->GetValue();
@@ -245,13 +245,13 @@ SfxPopupWindow* SvxFmTbxCtlConfig::CreatePopupWindow()
}
//-----------------------------------------------------------------------
-void SvxFmTbxCtlConfig::Select( USHORT /*nModifier*/ )
+void SvxFmTbxCtlConfig::Select( sal_uInt16 /*nModifier*/ )
{
//////////////////////////////////////////////////////////////////////
// Click auf den Button SID_FM_CONFIG in der ObjectBar
if ( nLastSlot )
{
- USHORT n = 0;
+ sal_uInt16 n = 0;
while( SlotToCommands[n].nSlotId > 0 )
{
if ( SlotToCommands[n].nSlotId == nLastSlot )
@@ -276,7 +276,7 @@ void SvxFmTbxCtlConfig::Select( USHORT /*nModifier*/ )
SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlAbsRec, SfxInt32Item );
DBG_NAME(SvxFmTbxCtlAbsRec);
//-----------------------------------------------------------------------
-SvxFmTbxCtlAbsRec::SvxFmTbxCtlAbsRec( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+SvxFmTbxCtlAbsRec::SvxFmTbxCtlAbsRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
:SfxToolBoxControl( nSlotId, nId, rTbx )
{
DBG_CTOR(SvxFmTbxCtlAbsRec,NULL);
@@ -289,9 +289,9 @@ SvxFmTbxCtlAbsRec::~SvxFmTbxCtlAbsRec()
}
//-----------------------------------------------------------------------
-void SvxFmTbxCtlAbsRec::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+void SvxFmTbxCtlAbsRec::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
{
- USHORT nId = GetId();
+ sal_uInt16 nId = GetId();
ToolBox* pToolBox = &GetToolBox();
SvxFmAbsRecWin* pWin = (SvxFmAbsRecWin*)( pToolBox->GetItemWindow(nId) );
@@ -304,7 +304,7 @@ void SvxFmTbxCtlAbsRec::StateChanged( USHORT nSID, SfxItemState eState, const Sf
pWin->SetValue( pItem ? pItem->GetValue() : -1 );
}
- BOOL bEnable = SFX_ITEM_DISABLED != eState && pState;
+ sal_Bool bEnable = SFX_ITEM_DISABLED != eState && pState;
if (!bEnable)
pWin->SetText(String());
@@ -330,7 +330,7 @@ Window* SvxFmTbxCtlAbsRec::CreateItemWindow( Window* pParent )
SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlRecText, SfxBoolItem );
DBG_NAME(SvxFmTbxCtlRecText);
//-----------------------------------------------------------------------
-SvxFmTbxCtlRecText::SvxFmTbxCtlRecText( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+SvxFmTbxCtlRecText::SvxFmTbxCtlRecText( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
:SfxToolBoxControl( nSlotId, nId, rTbx )
{
DBG_CTOR(SvxFmTbxCtlRecText,NULL);
@@ -364,7 +364,7 @@ Window* SvxFmTbxCtlRecText::CreateItemWindow( Window* pParent )
SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlRecFromText, SfxBoolItem );
DBG_NAME(SvxFmTbxCtlRecFromText);
//-----------------------------------------------------------------------
-SvxFmTbxCtlRecFromText::SvxFmTbxCtlRecFromText( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+SvxFmTbxCtlRecFromText::SvxFmTbxCtlRecFromText( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
:SfxToolBoxControl( nSlotId, nId, rTbx )
{
DBG_CTOR(SvxFmTbxCtlRecFromText,NULL);
@@ -397,7 +397,7 @@ DBG_NAME(SvxFmTbxCtlRecTotal);
SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlRecTotal, SfxStringItem );
//-----------------------------------------------------------------------
-SvxFmTbxCtlRecTotal::SvxFmTbxCtlRecTotal( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+SvxFmTbxCtlRecTotal::SvxFmTbxCtlRecTotal( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
:SfxToolBoxControl( nSlotId, nId, rTbx )
,pFixedText( NULL )
{
@@ -419,12 +419,12 @@ Window* SvxFmTbxCtlRecTotal::CreateItemWindow( Window* pParent )
aSize.Width() += 12;
pFixedText->SetSizePixel( aSize );
pFixedText->SetBackground();
- pFixedText->SetPaintTransparent(TRUE);
+ pFixedText->SetPaintTransparent(sal_True);
return pFixedText;
}
//-----------------------------------------------------------------------
-void SvxFmTbxCtlRecTotal::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+void SvxFmTbxCtlRecTotal::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
{
//////////////////////////////////////////////////////////////////////
// Setzen des FixedTextes
@@ -450,7 +450,7 @@ void SvxFmTbxCtlRecTotal::StateChanged( USHORT nSID, SfxItemState eState, const
SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxNextRec, SfxBoolItem );
//-----------------------------------------------------------------------
-SvxFmTbxNextRec::SvxFmTbxNextRec( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+SvxFmTbxNextRec::SvxFmTbxNextRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
:SfxToolBoxControl( nSlotId, nId, rTbx )
{
rTbx.SetItemBits(nId, rTbx.GetItemBits(nId) | TIB_REPEAT);
@@ -459,7 +459,7 @@ SvxFmTbxNextRec::SvxFmTbxNextRec( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
MouseSettings aMouseSettings = aSettings.GetMouseSettings();
aMouseSettings.SetButtonRepeat(aMouseSettings.GetButtonRepeat() / 4);
aSettings.SetMouseSettings(aMouseSettings);
- rTbx.SetSettings(aSettings, TRUE);
+ rTbx.SetSettings(aSettings, sal_True);
}
//========================================================================
@@ -468,7 +468,7 @@ SvxFmTbxNextRec::SvxFmTbxNextRec( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxPrevRec, SfxBoolItem );
//-----------------------------------------------------------------------
-SvxFmTbxPrevRec::SvxFmTbxPrevRec( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+SvxFmTbxPrevRec::SvxFmTbxPrevRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
:SfxToolBoxControl( nSlotId, nId, rTbx )
{
rTbx.SetItemBits(nId, rTbx.GetItemBits(nId) | TIB_REPEAT);
generated by cgit (git 2.34.1) at 2025-03-22 14:24:50 +0000