Merge remote-tracking branch 'origin/integration/dev300_m101'

Conflicts:
avmedia/source/framework/mediacontrol.cxx
connectivity/source/commontools/DateConversion.cxx
desktop/source/deployment/registry/component/dp_component.cxx
editeng/inc/editeng/numitem.hxx
editeng/inc/editeng/txtrange.hxx
editeng/source/editeng/editobj.cxx
editeng/source/editeng/editview.cxx
editeng/source/editeng/eehtml.cxx
editeng/source/editeng/impedit3.cxx
editeng/source/editeng/impedit4.cxx
editeng/source/misc/txtrange.cxx
editeng/source/outliner/outlin2.cxx
editeng/source/outliner/outlvw.cxx
framework/source/layoutmanager/layoutmanager.cxx
linguistic/source/lngsvcmgr.hxx
sfx2/source/appl/app.cxx
sfx2/source/appl/app.src
sfx2/source/appl/appbas.cxx
sfx2/source/appl/appcfg.cxx
sfx2/source/appl/appdde.cxx
sfx2/source/appl/appmain.cxx
sfx2/source/appl/appopen.cxx
sfx2/source/appl/appquit.cxx
sfx2/source/appl/appserv.cxx
sfx2/source/appl/childwin.cxx
sfx2/source/appl/fileobj.cxx
sfx2/source/appl/fileobj.hxx
sfx2/source/appl/workwin.cxx
sfx2/source/control/dispatch.cxx
sfx2/source/control/macro.cxx
sfx2/source/control/objface.cxx
sfx2/source/control/request.cxx
sfx2/source/control/shell.cxx
sfx2/source/control/statcach.cxx
sfx2/source/dialog/dinfdlg.cxx
sfx2/source/dialog/dockwin.cxx
sfx2/source/dialog/mailmodel.cxx
sfx2/source/dialog/mailmodelapi.cxx
sfx2/source/dialog/mgetempl.cxx
sfx2/source/dialog/splitwin.cxx
sfx2/source/dialog/styledlg.cxx
sfx2/source/dialog/tabdlg.cxx
sfx2/source/dialog/templdlg.cxx
sfx2/source/dialog/tplcitem.cxx
sfx2/source/dialog/tplpitem.cxx
sfx2/source/doc/doctempl.cxx
sfx2/source/doc/docvor.cxx
sfx2/source/doc/new.cxx
sfx2/source/doc/objcont.cxx
sfx2/source/doc/objserv.cxx
sfx2/source/doc/objxtor.cxx
sfx2/source/inc/appdata.hxx
sfx2/source/inc/helpid.hrc
sfx2/source/inc/sfxlocal.hrc
sfx2/source/inc/statcach.hxx
sfx2/source/inc/templdgi.hxx
sfx2/source/inc/virtmenu.hxx
sfx2/source/inc/workwin.hxx
sfx2/source/menu/mnumgr.cxx
sfx2/source/menu/virtmenu.cxx
sfx2/source/statbar/stbitem.cxx
sfx2/source/view/frame.cxx
sfx2/source/view/frame2.cxx
sfx2/source/view/orgmgr.cxx
sfx2/source/view/printer.cxx
sfx2/source/view/prnmon.cxx
sfx2/source/view/sfxbasecontroller.cxx
sfx2/source/view/viewfrm.cxx
sfx2/source/view/viewfrm2.cxx
sfx2/source/view/viewprn.cxx
sfx2/source/view/viewsh.cxx
svx/inc/svx/svditer.hxx
svx/source/dialog/sdstring.src
svx/source/form/fmpage.cxx
svx/source/form/formcontroller.cxx
svx/source/svdraw/svdcrtv.cxx
svx/source/svdraw/svditer.cxx
svx/source/svdraw/svdview.cxx
xmloff/source/forms/elementimport.cxx

1 files changed, 59 insertions, 59 deletions

diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 67727eb1fdf6..df4f2448342a 100644..100755
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -34,12 +34,12 @@
 #include "fmservs.hxx"
 
 #include "datanavi.hrc"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "fmhelp.hrc"
 #include <svx/svxids.hrc>
 #include <tools/rcid.h>
 #include <tools/diagnose_ex.h>
-#include "xmlexchg.hxx"
+#include "svx/xmlexchg.hxx"
 #include <svx/dialmgr.hxx>
 #include <svx/fmshell.hxx>
 #include <svtools/miscopt.hxx>
@@ -267,7 +267,7 @@ namespace svxform
         return pMenu;
     }
 
-    void DataTreeListBox::ExcecuteContextMenuAction( USHORT _nSelectedPopupEntry )
+    void DataTreeListBox::ExcecuteContextMenuAction( sal_uInt16 _nSelectedPopupEntry )
     {
         m_pXFormsPage->DoMenuAction( _nSelectedPopupEntry );
     }
@@ -283,7 +283,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);
@@ -352,7 +352,7 @@ namespace svxform
         WinBits nBits = WB_BORDER | WB_TABSTOP | WB_HIDESELECTION | WB_NOINITIALSELECTION;
         if ( DGTInstance == m_eGroup || DGTSubmission == m_eGroup )
             nBits |= WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT;
-        m_aItemList.SetWindowBits( m_aItemList.GetStyle() | nBits  );
+        m_aItemList.SetStyle( m_aItemList.GetStyle() | nBits  );
         m_aItemList.Show();
         ItemSelectHdl( &m_aItemList );
     }
@@ -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
@@ -776,7 +776,7 @@ namespace svxform
     {
         SvLBoxEntry* pParent = m_aItemList.FirstSelected();
         const ImageList& rImageList = 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
@@ -789,7 +789,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
@@ -993,7 +993,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 );
@@ -1037,7 +1037,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& )
             {
@@ -1074,7 +1074,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;
@@ -1125,7 +1125,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();
@@ -1157,7 +1157,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;
@@ -1204,7 +1204,7 @@ namespace svxform
 
         if ( rNEvt.GetType() == EVENT_KEYINPUT )
         {
-            USHORT nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
+            sal_uInt16 nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
 
             switch ( nCode )
             {
@@ -1228,7 +1228,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" );
 
@@ -1254,7 +1254,7 @@ namespace svxform
                         Reference < XEnumeration > xNum = xNumAccess->createEnumeration();
                         if ( xNum.is() && xNum->hasMoreElements() )
                         {
-                            USHORT nIter = 0;
+                            sal_uInt16 nIter = 0;
                             while ( xNum->hasMoreElements() )
                             {
                                 if ( nIter == _nPagePos )
@@ -1351,7 +1351,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 );
                                 }
                             }
                         }
@@ -1428,7 +1428,7 @@ namespace svxform
     }
 
     //------------------------------------------------------------------------
-    bool XFormsPage::DoMenuAction( USHORT _nMenuID )
+    bool XFormsPage::DoMenuAction( sal_uInt16 _nMenuID )
     {
         return DoToolBoxAction( _nMenuID );
     }
@@ -1436,14 +1436,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 ) )
             {
@@ -1453,10 +1453,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
@@ -1465,7 +1465,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& )
@@ -1476,7 +1476,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 );
@@ -1494,8 +1494,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() );
@@ -1592,7 +1592,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
@@ -1636,7 +1636,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 )
         {
@@ -1653,7 +1653,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
@@ -1709,7 +1709,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;
@@ -1826,7 +1826,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();
@@ -1852,7 +1852,7 @@ namespace svxform
                 }
                 case MID_INSTANCES_EDIT :
                 {
-                    USHORT nId = 0;
+                    sal_uInt16 nId = 0;
                     XFormsPage* pPage = GetCurrentPage( nId );
                     if ( pPage )
                     {
@@ -1889,7 +1889,7 @@ namespace svxform
                 }
                 case MID_INSTANCES_REMOVE :
                 {
-                    USHORT nId = 0;
+                    sal_uInt16 nId = 0;
                     XFormsPage* pPage = GetCurrentPage( nId );
                     if ( pPage )
                     {
@@ -1989,7 +1989,7 @@ namespace svxform
     // -----------------------------------------------------------------------
     IMPL_LINK( DataNavigatorWindow, ActivatePageHdl, TabControl *, EMPTYARG )
     {
-        USHORT nId = 0;
+        sal_uInt16 nId = 0;
         XFormsPage* pPage = GetCurrentPage( nId );
         if ( pPage )
         {
@@ -2007,7 +2007,7 @@ namespace svxform
         return 0;
     }
     // -----------------------------------------------------------------------
-    XFormsPage* DataNavigatorWindow::GetCurrentPage( USHORT& rCurId )
+    XFormsPage* DataNavigatorWindow::GetCurrentPage( sal_uInt16& rCurId )
     {
         rCurId = m_aTabCtrl.GetCurPageId();
         XFormsPage* pPage = NULL;
@@ -2040,7 +2040,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 )
@@ -2121,8 +2121,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 )
@@ -2235,7 +2235,7 @@ namespace svxform
             }
         }
 
-        USHORT nPageId = GetNewPageId();
+        sal_uInt16 nPageId = GetNewPageId();
         if ( sInstName.getLength() == 0 )
         {
             DBG_ERRORFILE( "DataNavigatorWindow::CreateInstancePage(): instance without name" );
@@ -2253,9 +2253,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) )
@@ -2591,7 +2591,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;
@@ -2883,19 +2883,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& )
                 {
@@ -2965,7 +2965,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 );
@@ -3200,7 +3200,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 );
 
@@ -3589,7 +3589,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 );