Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

* commit 'ooo/DEV300_m101': (185 commits)
masterfix DEV300: #i10000# usage of L10N build_type
masterfix: #i10000# INT16 -> sal_Int16
fixed compile errors after resync to m100, part2
gridsort: post-rebase fixes
CWS gnumake3: found another tools integer type
removetooltypes01: Fix build problems after rebase to DEV300m99 in basctl, cui, reportdesign, sw
native359: #i114398# changing mac langpack icon
native359: #i115669# fixing package description for solaris packages
gnumake3: remove comphelper version; fix including extract.hxx
locales34: #i106785# add Haitian_Haiti [ht-HT] to language list and locale data; locale data contributed by <jcpoulard>
sb138: #i116659# timely termination of OnLogRotateThread
accfixes: removed include of obsolete header file
accfixes: removed obsolete file
removetooltypes01: #i112600# Fix build problems on non-pro
accfixes: moved some shared strings to svx part2
accfixes: moved some shared strings to svx
accfixes: added more accessibility information and fixed tab orders in multiple dialogs (cui module)
removetooltypes01: #i112600# Remove tools types for Mac specific parts
fixed tab order in BasicIDE, Library dialog tab page
added some accessible names in BasicIDE
...

Conflicts:
UnoControls/source/base/registercontrols.cxx
accessibility/inc/accessibility/standard/vclxaccessiblelistboxlist.hxx
automation/inc/automation/communi.hxx
automation/inc/automation/simplecm.hxx
automation/source/communi/communi.cxx
automation/source/inc/rcontrol.hxx
automation/source/miniapp/servuid.hxx
automation/source/server/XMLParser.cxx
automation/source/server/cmdbasestream.cxx
automation/source/server/profiler.hxx
automation/source/server/recorder.cxx
automation/source/server/retstrm.hxx
automation/source/server/server.cxx
automation/source/server/sta_list.cxx
automation/source/server/statemnt.cxx
automation/source/server/statemnt.hxx
automation/source/simplecm/packethandler.cxx
automation/source/simplecm/simplecm.cxx
automation/source/simplecm/tcpio.cxx
automation/source/simplecm/tcpio.hxx
automation/source/testtool/comm_bas.hxx
automation/source/testtool/cretstrm.hxx
automation/source/testtool/httprequest.cxx
automation/source/testtool/httprequest.hxx
automation/source/testtool/objtest.cxx
automation/source/testtool/objtest.hxx
basctl/source/basicide/baside2.cxx
basctl/source/basicide/baside2.hxx
basctl/source/basicide/baside2b.cxx
basctl/source/basicide/baside3.cxx
basctl/source/basicide/basides1.cxx
basctl/source/basicide/basides2.cxx
basctl/source/basicide/basidesh.cxx
basctl/source/basicide/basidesh.src
basctl/source/basicide/basobj3.cxx
basctl/source/basicide/bastype2.cxx
basctl/source/basicide/bastype3.cxx
basctl/source/basicide/bastypes.cxx
basctl/source/basicide/brkdlg.cxx
basctl/source/basicide/iderdll.cxx
basctl/source/basicide/macrodlg.cxx
basctl/source/basicide/moduldl2.cxx
basctl/source/basicide/moduldlg.cxx
basctl/source/basicide/objdlg.cxx
basctl/source/basicide/scriptdocument.cxx
basctl/source/basicide/tbxctl.cxx
basctl/source/basicide/tbxctl.hxx
basctl/source/basicide/tbxctl.src
basctl/source/dlged/dlged.cxx
basctl/source/dlged/dlgedfunc.cxx
basctl/source/dlged/dlgedobj.cxx
basctl/source/inc/basidesh.hxx
basctl/source/inc/bastypes.hxx
basctl/source/inc/dlgedmod.hxx
basctl/source/inc/dlgedpage.hxx
crashrep/prj/build.lst
cui/inc/pch/precompiled_cui.hxx
cui/source/customize/acccfg.cxx
cui/source/customize/acccfg.hrc
cui/source/customize/acccfg.src
cui/source/customize/cfg.cxx
cui/source/customize/cfgutil.cxx
cui/source/customize/macropg.cxx
cui/source/customize/macropg.src
cui/source/customize/selector.cxx
cui/source/dialogs/SpellDialog.cxx
cui/source/dialogs/commonlingui.cxx
cui/source/dialogs/cuicharmap.cxx
cui/source/dialogs/cuifmsearch.cxx
cui/source/dialogs/cuigaldlg.cxx
cui/source/dialogs/cuigrfflt.cxx
cui/source/dialogs/hldocntp.cxx
cui/source/dialogs/hldoctp.cxx
cui/source/dialogs/hlinettp.cxx
cui/source/dialogs/hlmailtp.cxx
cui/source/dialogs/hlmarkwn.cxx
cui/source/dialogs/hlmarkwn.src
cui/source/dialogs/hltpbase.cxx
cui/source/dialogs/iconcdlg.cxx
cui/source/dialogs/passwdomdlg.cxx
cui/source/dialogs/pastedlg.cxx
cui/source/dialogs/scriptdlg.cxx
cui/source/dialogs/thesdlg.cxx
cui/source/dialogs/zoom.cxx
cui/source/factory/dlgfact.hxx
cui/source/inc/SpellDialog.hxx
cui/source/inc/autocdlg.hxx
cui/source/inc/backgrnd.hxx
cui/source/inc/bbdlg.hxx
cui/source/inc/cfg.hxx
cui/source/inc/cfgutil.hxx
cui/source/inc/cuigaldlg.hxx
cui/source/inc/cuigrfflt.hxx
cui/source/inc/cuitabarea.hxx
cui/source/inc/cuitabline.hxx
cui/source/inc/hldocntp.hxx
cui/source/inc/hltpbase.hxx
cui/source/inc/iconcdlg.hxx
cui/source/inc/numpages.hxx
cui/source/inc/page.hxx
cui/source/inc/postdlg.hxx
cui/source/inc/scriptdlg.hxx
cui/source/inc/transfrm.hxx
cui/source/inc/zoom.hxx
cui/source/options/cfgchart.cxx
cui/source/options/cuisrchdlg.cxx
cui/source/options/dbregister.cxx
cui/source/options/dbregister.src
cui/source/options/fontsubs.cxx
cui/source/options/internationaloptions.cxx
cui/source/options/optasian.cxx
cui/source/options/optchart.cxx
cui/source/options/optcolor.cxx
cui/source/options/optcolor.src
cui/source/options/optfltr.cxx
cui/source/options/optfltr.src
cui/source/options/optgdlg.cxx
cui/source/options/optgdlg.src
cui/source/options/optgenrl.cxx
cui/source/options/opthtml.cxx
cui/source/options/optimprove.cxx
cui/source/options/optinet2.cxx
cui/source/options/optinet2.hxx
cui/source/options/optjava.cxx
cui/source/options/optlingu.cxx
cui/source/options/optsave.cxx
cui/source/options/optsave.hxx
cui/source/options/treeopt.cxx
cui/source/options/webconninfo.cxx
cui/source/tabpages/autocdlg.cxx
cui/source/tabpages/backgrnd.cxx
cui/source/tabpages/border.cxx
cui/source/tabpages/chardlg.cxx
cui/source/tabpages/dstribut.cxx
cui/source/tabpages/grfpage.cxx
cui/source/tabpages/macroass.cxx
cui/source/tabpages/measure.cxx
cui/source/tabpages/numfmt.cxx
cui/source/tabpages/numpages.cxx
cui/source/tabpages/page.cxx
cui/source/tabpages/paragrph.cxx
cui/source/tabpages/swpossizetabpage.cxx
cui/source/tabpages/tabarea.src
cui/source/tabpages/textanim.cxx
cui/source/tabpages/textattr.cxx
cui/source/tabpages/tparea.cxx
cui/source/tabpages/tpbitmap.cxx
cui/source/tabpages/tpcolor.cxx
cui/source/tabpages/tpgradnt.cxx
cui/source/tabpages/tphatch.cxx
cui/source/tabpages/tpline.cxx
cui/source/tabpages/tplnedef.cxx
cui/source/tabpages/tplneend.cxx
cui/source/tabpages/tpshadow.cxx
cui/source/tabpages/transfrm.cxx
embedserv/source/embed/register.cxx
extensions/inc/pch/precompiled_extensions.hxx
extensions/inc/propctrlr.hrc
extensions/source/abpilot/abpservices.cxx
extensions/source/bibliography/bibload.cxx
extensions/source/bibliography/datman.cxx
extensions/source/bibliography/general.cxx
extensions/source/dbpilots/dbpservices.cxx
extensions/source/inc/componentmodule.cxx
extensions/source/nsplugin/source/so_env.cxx
extensions/source/ole/oleobjw.cxx
extensions/source/ole/oleobjw.hxx
extensions/source/oooimprovement/invite_job.cxx
extensions/source/oooimprovement/onlogrotate_job.cxx
extensions/source/plugin/base/service.cxx
extensions/source/plugin/inc/plugin/unx/mediator.hxx
extensions/source/plugin/inc/plugin/unx/plugcon.hxx
extensions/source/plugin/unx/mediator.cxx
extensions/source/plugin/unx/nppapi.cxx
extensions/source/plugin/unx/plugcon.cxx
extensions/source/preload/services.cxx
extensions/source/propctrlr/formmetadata.cxx
extensions/source/propctrlr/pcrservices.cxx
extensions/source/resource/resource.cxx
extensions/source/scanner/sane.hxx
extensions/source/scanner/sanedlg.cxx
extensions/source/scanner/scanunx.cxx
extensions/source/scanner/scanwin.cxx
extensions/source/scanner/twain.cxx
extensions/source/scanner/twain.hxx
extensions/source/update/check/updatecheckconfig.cxx
extensions/test/stm/datatest.cxx
extensions/test/stm/marktest.cxx
extensions/test/stm/pipetest.cxx
extensions/test/stm/testfactreg.cxx
extensions/workben/testpgp.cxx
forms/qa/complex/forms/CheckOGroupBoxModel.java
forms/qa/makefile.mk
forms/source/component/Button.cxx
forms/source/component/Button.hxx
forms/source/component/ListBox.cxx
forms/source/inc/forms_module_impl.hxx
forms/source/misc/services.cxx
forms/source/solar/control/navtoolbar.cxx
javainstaller2/prj/build.lst
javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java
lingucomponent/prj/build.lst
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
lingucomponent/source/spellcheck/spell/sreg.cxx
lingucomponent/source/spellcheck/spell/sspellimp.cxx
package/source/manifest/ManifestExport.cxx
package/source/manifest/UnoRegister.cxx
package/source/xstor/owriteablestream.cxx
package/source/xstor/owriteablestream.hxx
package/source/xstor/xstorage.hxx
package/source/zippackage/ZipPackageFolder.cxx
package/source/zippackage/ZipPackageStream.cxx
setup_native/source/mac/ooo/DS_Store
setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
xmlsecurity/prj/build.lst
xmlsecurity/source/component/registerservices.cxx
xmlsecurity/source/dialogs/stbcontrl.cxx
xmlsecurity/source/framework/xsec_framework.cxx
xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
xmlsecurity/tools/demo/util.hxx
xmlsecurity/workben/signaturetest.cxx

1 files changed, 109 insertions, 98 deletions

diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index cfa9731a63c9..b2e10d6210a2 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -61,6 +61,7 @@
 #include <svx/gallery.hxx>
 #include <svx/xbitmap.hxx>
 #include <unotools/localfilehelper.hxx>
+#include "paragrph.hrc"
 #include "sfx2/opengrf.hxx"
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
@@ -77,7 +78,7 @@
 
 // static ----------------------------------------------------------------
 
-static USHORT pLineRanges[] =
+static sal_uInt16 pLineRanges[] =
 {
     XATTR_LINETRANSPARENCE,
     XATTR_LINETRANSPARENCE,
@@ -98,6 +99,7 @@ SvxLineTabPage::SvxLineTabPage
     const SfxItemSet& rInAttrs
 ) :
     SvxTabPage          ( pParent, CUI_RES( RID_SVXPAGE_LINE ), rInAttrs ),
+    aFlLine             ( this, CUI_RES( FL_LINE ) ),
     aFtLineStyle        ( this, CUI_RES( FT_LINE_STYLE ) ),
     aLbLineStyle        ( this, CUI_RES( LB_LINE_STYLE ) ),
     aFtColor            ( this, CUI_RES( FT_COLOR ) ),
@@ -106,19 +108,18 @@ SvxLineTabPage::SvxLineTabPage
     aMtrLineWidth       ( this, CUI_RES( MTR_FLD_LINE_WIDTH ) ),
     aFtTransparent      ( this, CUI_RES( FT_TRANSPARENT ) ),
     aMtrTransparent     ( this, CUI_RES( MTR_LINE_TRANSPARENT ) ),
-    aFlLine             ( this, CUI_RES( FL_LINE ) ),
-    aFtLineEndsStyle    ( this, CUI_RES( FT_LINE_ENDS_STYLE ) ),
+    aFlLineEnds         ( this, CUI_RES( FL_LINE_ENDS ) ),
     aLbStartStyle       ( this, CUI_RES( LB_START_STYLE ) ),
-    aFtLineEndsWidth    ( this, CUI_RES( FT_LINE_ENDS_WIDTH ) ),
     aMtrStartWidth      ( this, CUI_RES( MTR_FLD_START_WIDTH ) ),
     aTsbCenterStart     ( this, CUI_RES( TSB_CENTER_START ) ),
+    aFtLineEndsStyle    ( this, CUI_RES( FT_LINE_ENDS_STYLE ) ),
     aLbEndStyle         ( this, CUI_RES( LB_END_STYLE ) ),
+    aFtLineEndsWidth    ( this, CUI_RES( FT_LINE_ENDS_WIDTH ) ),
     aMtrEndWidth        ( this, CUI_RES( MTR_FLD_END_WIDTH ) ),
     aTsbCenterEnd       ( this, CUI_RES( TSB_CENTER_END ) ),
     aCbxSynchronize     ( this, CUI_RES( CBX_SYNCHRONIZE ) ),
-    aFlLineEnds         ( this, CUI_RES( FL_LINE_ENDS ) ),
-    aCtlPreview         ( this, CUI_RES( CTL_PREVIEW ) ),
     aFLSeparator        ( this, CUI_RES( FL_SEPARATOR ) ),
+    aCtlPreview         ( this, CUI_RES( CTL_PREVIEW ) ),
 
     // #116827#
     maFLEdgeStyle       ( this, CUI_RES( FL_EDGE_STYLE ) ),
@@ -139,9 +140,9 @@ SvxLineTabPage::SvxLineTabPage
     aSymbolHeightMF     ( this, CUI_RES(MF_SYMBOL_HEIGHT)),
     aSymbolRatioCB      ( this, CUI_RES(CB_SYMBOL_RATIO)),
 
-    bLastWidthModified(FALSE),
+    bLastWidthModified(sal_False),
     aSymbolLastSize(Size(0,0)),
-    bSymbols(FALSE),
+    bSymbols(sal_False),
 
     rOutAttrs           ( rInAttrs ),
     bObjSelected( sal_False ),
@@ -158,8 +159,18 @@ SvxLineTabPage::SvxLineTabPage
     pnColorTableState( 0 ),
    nPageType           ( 0 )
 {
+    aLbEndStyle.SetAccessibleName(String(CUI_RES(STR_STYLE)));
+    aLbStartStyle.SetAccessibleName(String(CUI_RES( STR_LB_START_STYLE ) ) );
+    aMtrStartWidth.SetAccessibleName(String(CUI_RES( STR_MTR_FLD_START_WIDTH ) ) );
+    aLbEndStyle.SetAccessibleName(String(CUI_RES( STR_LB_END_STYLE ) ) );
+    aMtrEndWidth.SetAccessibleName(String(CUI_RES( STR_MTR_FLD_END_WIDTH ) ) );
+    aTsbCenterStart.SetAccessibleName(String(CUI_RES( STR_CENTER_START ) ) );
+    aTsbCenterEnd.SetAccessibleName(String(CUI_RES( STR_CENTER_END ) ) );
+
     FreeResource();
 
+    aCtlPreview.SetAccessibleName(String(CUI_RES(STR_EXAMPLE)));
+
     // diese Page braucht ExchangeSupport
     SetExchangeSupport();
 
@@ -227,14 +238,14 @@ SvxLineTabPage::SvxLineTabPage
     aSymbolHeightMF.SetModifyHdl(LINK(this, SvxLineTabPage, SizeHdl_Impl));
     aSymbolRatioCB.SetClickHdl(LINK(this, SvxLineTabPage, RatioHdl_Impl));
 
-    aSymbolRatioCB.Check(TRUE);
-    ShowSymbolControls(FALSE);
+    aSymbolRatioCB.Check(sal_True);
+    ShowSymbolControls(sal_False);
 
     // #63083#
     nActLineWidth = -1;
 }
 //#58425# Symbole auf einer Linie (z.B. StarChart) , Symbol-Controls aktivieren
-void SvxLineTabPage::ShowSymbolControls(BOOL bOn)
+void SvxLineTabPage::ShowSymbolControls(sal_Bool bOn)
 {
     bSymbols=bOn;
     aSymbolWidthFT.Show(bOn);
@@ -279,7 +290,7 @@ void SvxLineTabPage::Construct()
 void SvxLineTabPage::FillListboxes()
 {
     // Linienstile
-    USHORT nOldSelect = aLbLineStyle.GetSelectEntryPos();
+    sal_uInt16 nOldSelect = aLbLineStyle.GetSelectEntryPos();
     aLbLineStyle.FillStyles();
     aLbLineStyle.Fill( pDashList );
     aLbLineStyle.SelectEntryPos( nOldSelect );
@@ -294,7 +305,7 @@ void SvxLineTabPage::FillListboxes()
     nOldSelect = aLbEndStyle.GetSelectEntryPos();
     aLbEndStyle.Clear();
     aLbEndStyle.InsertEntry( sNone );
-    aLbEndStyle.Fill( pLineEndList, FALSE );
+    aLbEndStyle.Fill( pLineEndList, sal_False );
     aLbEndStyle.SelectEntryPos( nOldSelect );
 }
 
@@ -307,8 +318,8 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet )
         SetPageType(pPageTypeItem->GetValue());
     if( nDlgType == 0 && pDashList )
     {
-        USHORT nPos;
-        USHORT nCount;
+        sal_uInt16 nPos;
+        sal_uInt16 nCount;
 
         // Dashliste
         if( ( *pnDashListState & CT_MODIFIED ) ||
@@ -369,7 +380,7 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet )
             aLbEndStyle.Clear();
             aLbEndStyle.InsertEntry( sNone );
 
-            aLbEndStyle.Fill( pLineEndList, FALSE );
+            aLbEndStyle.Fill( pLineEndList, sal_False );
             nCount = aLbEndStyle.GetEntryCount();
 
             if( nCount == 0 )
@@ -453,7 +464,7 @@ int SvxLineTabPage::DeactivatePage( SfxItemSet* _pSet )
     {
         nPageType = 1; // evtl. fuer Erweiterungen
         *pPosDashLb = aLbLineStyle.GetSelectEntryPos() - 2;// erster Eintrag SOLID !!!
-        USHORT nPos = aLbStartStyle.GetSelectEntryPos();
+        sal_uInt16 nPos = aLbStartStyle.GetSelectEntryPos();
         if( nPos != LISTBOX_ENTRY_NOTFOUND )
             nPos--;
         *pPosLineEndLb = nPos;
@@ -467,11 +478,11 @@ int SvxLineTabPage::DeactivatePage( SfxItemSet* _pSet )
 
 // -----------------------------------------------------------------------
 
-BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
+sal_Bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
 {
     const SfxPoolItem* pOld = NULL;
-    USHORT  nPos;
-    BOOL    bModified = FALSE;
+    sal_uInt16  nPos;
+    sal_Bool    bModified = sal_False;
 
     // Um evtl. Modifikationen der Liste vorzubeugen
     // werden Items anderer Seiten nicht gesetzt
@@ -500,7 +511,7 @@ BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
                     if ( !pOld || !( *(const XLineDashItem*)pOld == aDashItem ) )
                     {
                         rAttrs.Put( aDashItem );
-                        bModified = TRUE;
+                        bModified = sal_True;
                     }
                 }
             }
@@ -508,7 +519,7 @@ BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
             if ( !pOld || !( *(const XLineStyleItem*)pOld == *pStyleItem ) )
             {
                 rAttrs.Put( *pStyleItem );
-                bModified = TRUE;
+                bModified = sal_True;
             }
             delete pStyleItem;
         }
@@ -522,7 +533,7 @@ BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
         if ( !pOld || !( *(const XLineWidthItem*)pOld == aItem ) )
         {
             rAttrs.Put( aItem );
-            bModified = TRUE;
+            bModified = sal_True;
         }
     }
     //Breite Linienanfang
@@ -533,7 +544,7 @@ BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
         if ( !pOld || !( *(const XLineStartWidthItem*)pOld == aItem ) )
         {
             rAttrs.Put( aItem );
-            bModified = TRUE;
+            bModified = sal_True;
         }
     }
     //Breite Linienende
@@ -544,7 +555,7 @@ BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
         if ( !pOld || !( *(const XLineEndWidthItem*)pOld == aItem ) )
         {
             rAttrs.Put( aItem );
-            bModified = TRUE;
+            bModified = sal_True;
         }
     }
 
@@ -557,7 +568,7 @@ BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
         if ( !pOld || !( *(const XLineColorItem*)pOld == aItem ) )
         {
             rAttrs.Put( aItem );
-            bModified = TRUE;
+            bModified = sal_True;
         }
     }
 
@@ -579,7 +590,7 @@ BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
                 ( !pOld || !( *(const XLineEndItem*)pOld == *pItem ) ) )
             {
                 rAttrs.Put( *pItem );
-                bModified = TRUE;
+                bModified = sal_True;
             }
             delete pItem;
         }
@@ -599,7 +610,7 @@ BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
                 ( !pOld || !( *(const XLineEndItem*)pOld == *pItem ) ) )
             {
                 rAttrs.Put( *pItem );
-                bModified = TRUE;
+                bModified = sal_True;
             }
             delete pItem;
         }
@@ -609,23 +620,23 @@ BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
     TriState eState = aTsbCenterStart.GetState();
     if( eState != aTsbCenterStart.GetSavedValue() )
     {
-        XLineStartCenterItem aItem( sal::static_int_cast< BOOL >( eState ) );
+        XLineStartCenterItem aItem( sal::static_int_cast< sal_Bool >( eState ) );
         pOld = GetOldItem( rAttrs, XATTR_LINESTARTCENTER );
         if ( !pOld || !( *(const XLineStartCenterItem*)pOld == aItem ) )
         {
             rAttrs.Put( aItem );
-            bModified = TRUE;
+            bModified = sal_True;
         }
     }
     eState = aTsbCenterEnd.GetState();
     if( eState != aTsbCenterEnd.GetSavedValue() )
     {
-        XLineEndCenterItem aItem( sal::static_int_cast< BOOL >( eState ) );
+        XLineEndCenterItem aItem( sal::static_int_cast< sal_Bool >( eState ) );
         pOld = GetOldItem( rAttrs, XATTR_LINEENDCENTER );
         if ( !pOld || !( *(const XLineEndCenterItem*)pOld == aItem ) )
         {
             rAttrs.Put( aItem );
-            bModified = TRUE;
+            bModified = sal_True;
         }
     }
 
@@ -637,7 +648,7 @@ BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
         if ( !pOld || !( *(const XLineStartWidthItem*)pOld == aItem ) )
         {
             rAttrs.Put( aItem );
-            bModified = TRUE;
+            bModified = sal_True;
         }
     }
     //Breite Linienende
@@ -648,20 +659,20 @@ BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
         if ( !pOld || !( *(const XLineEndWidthItem*)pOld == aItem ) )
         {
             rAttrs.Put( aItem );
-            bModified = TRUE;
+            bModified = sal_True;
         }
     }
 
     // Transparenz
-    UINT16 nVal = (UINT16)aMtrTransparent.GetValue();
-    if( nVal != (UINT16)aMtrTransparent.GetSavedValue().ToInt32() )
+    sal_uInt16 nVal = (sal_uInt16)aMtrTransparent.GetValue();
+    if( nVal != (sal_uInt16)aMtrTransparent.GetSavedValue().ToInt32() )
     {
         XLineTransparenceItem aItem( nVal );
         pOld = GetOldItem( rAttrs, XATTR_LINETRANSPARENCE );
         if ( !pOld || !( *(const XLineTransparenceItem*)pOld == aItem ) )
         {
             rAttrs.Put( aItem );
-            bModified = TRUE;
+            bModified = sal_True;
         }
     }
 
@@ -702,7 +713,7 @@ BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
             if(!pOld || !(*(const XLineJointItem*)pOld == *pNew))
             {
                 rAttrs.Put( *pNew );
-                bModified = TRUE;
+                bModified = sal_True;
             }
 
             delete pNew;
@@ -718,7 +729,7 @@ BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
         if(bNewSize)
         {
             rAttrs.Put(aSItem);
-            bModified=TRUE;
+            bModified=sal_True;
         }
 
         SfxInt32Item aTItem(rAttrs.GetPool()->GetWhich(SID_ATTR_SYMBOLTYPE),nSymbolType);
@@ -729,7 +740,7 @@ BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
         if(bNewType)
         {
             rAttrs.Put(aTItem);
-            bModified=TRUE;
+            bModified=sal_True;
         }
 
         if(nSymbolType!=SVX_SYMBOLTYPE_NONE)
@@ -741,7 +752,7 @@ BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
             if(bNewBrush)
             {
                 rAttrs.Put(aBItem);
-                bModified=TRUE;
+                bModified=sal_True;
             }
         }
     }
@@ -751,9 +762,9 @@ BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
 
 // -----------------------------------------------------------------------
 
-BOOL SvxLineTabPage::FillXLSet_Impl()
+sal_Bool SvxLineTabPage::FillXLSet_Impl()
 {
-    USHORT nPos;
+    sal_uInt16 nPos;
 
     if( aLbLineStyle.GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND )
     {
@@ -832,23 +843,23 @@ BOOL SvxLineTabPage::FillXLSet_Impl()
 
     // Linienenden zentriert
     if( aTsbCenterStart.GetState() == STATE_CHECK )
-        rXLSet.Put( XLineStartCenterItem( TRUE ) );
+        rXLSet.Put( XLineStartCenterItem( sal_True ) );
     else if( aTsbCenterStart.GetState() == STATE_NOCHECK )
-        rXLSet.Put( XLineStartCenterItem( FALSE ) );
+        rXLSet.Put( XLineStartCenterItem( sal_False ) );
 
     if( aTsbCenterEnd.GetState() == STATE_CHECK )
-        rXLSet.Put( XLineEndCenterItem( TRUE ) );
+        rXLSet.Put( XLineEndCenterItem( sal_True ) );
     else if( aTsbCenterEnd.GetState() == STATE_NOCHECK )
-        rXLSet.Put( XLineEndCenterItem( FALSE ) );
+        rXLSet.Put( XLineEndCenterItem( sal_False ) );
 
     // Transparenz
-    UINT16 nVal = (UINT16)aMtrTransparent.GetValue();
+    sal_uInt16 nVal = (sal_uInt16)aMtrTransparent.GetValue();
     rXLSet.Put( XLineTransparenceItem( nVal ) );
 
     // #116827#
     aCtlPreview.SetLineAttributes(aXLineAttr.GetItemSet());
 
-    return( TRUE );
+    return( sal_True );
 }
 
 // -----------------------------------------------------------------------
@@ -861,11 +872,11 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
     // Linienstil
     const SfxPoolItem *pPoolItem;
     long nSymType=SVX_SYMBOLTYPE_UNKNOWN;
-    BOOL bPrevSym=FALSE;
-    BOOL bEnable=TRUE;
-    BOOL bIgnoreGraphic=FALSE;
-    BOOL bIgnoreSize=FALSE;
-    if(rAttrs.GetItemState(rAttrs.GetPool()->GetWhich(SID_ATTR_SYMBOLTYPE),TRUE,&pPoolItem) == SFX_ITEM_SET)
+    sal_Bool bPrevSym=sal_False;
+    sal_Bool bEnable=sal_True;
+    sal_Bool bIgnoreGraphic=sal_False;
+    sal_Bool bIgnoreSize=sal_False;
+    if(rAttrs.GetItemState(rAttrs.GetPool()->GetWhich(SID_ATTR_SYMBOLTYPE),sal_True,&pPoolItem) == SFX_ITEM_SET)
     {
         nSymType=((const SfxInt32Item *)pPoolItem)->GetValue();
     }
@@ -874,13 +885,13 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
     {
         aSymbolGraphic=aAutoSymbolGraphic;
         aSymbolSize=aSymbolLastSize=aAutoSymbolGraphic.GetPrefSize();
-        bPrevSym=TRUE;
+        bPrevSym=sal_True;
     }
     else if(nSymType == SVX_SYMBOLTYPE_NONE)
     {
-        bEnable=FALSE;
-        bIgnoreGraphic=TRUE;
-        bIgnoreSize=TRUE;
+        bEnable=sal_False;
+        bIgnoreGraphic=sal_True;
+        bIgnoreSize=sal_True;
     }
     else if(nSymType >= 0)
     {
@@ -889,7 +900,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
 
         SdrModel* pModel = new SdrModel(NULL, NULL, LOADREFCOUNTS);
         pModel->GetItemPool().FreezeIdRanges();
-        SdrPage* pPage = new SdrPage( *pModel, FALSE );
+        SdrPage* pPage = new SdrPage( *pModel, sal_False );
         pPage->SetSize(Size(1000,1000));
         pModel->InsertPage( pPage, 0 );
         SdrView* pView = new SdrView( pModel, &aVDev );
@@ -922,9 +933,9 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
                     aSymbolSize=pObj->GetSnapRect().GetSize();
                     aSymbolGraphic.SetPrefSize(aSymbolSize);
                     aSymbolGraphic.SetPrefMapMode(MAP_100TH_MM);
-                    bPrevSym=TRUE;
-                    bEnable=TRUE;
-                    bIgnoreGraphic=TRUE;
+                    bPrevSym=sal_True;
+                    bEnable=sal_True;
+                    bIgnoreGraphic=sal_True;
 
                     pView->UnmarkAll();
                     pObj=pPage->RemoveObject(0);
@@ -935,7 +946,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
         delete pView;
         delete pModel;
     }
-    if(rAttrs.GetItemState(rAttrs.GetPool()->GetWhich(SID_ATTR_BRUSH),TRUE,&pPoolItem) == SFX_ITEM_SET)
+    if(rAttrs.GetItemState(rAttrs.GetPool()->GetWhich(SID_ATTR_BRUSH),sal_True,&pPoolItem) == SFX_ITEM_SET)
     {
         const Graphic* pGraphic = ((const SvxBrushItem *)pPoolItem)->GetGraphic();
         if( pGraphic )
@@ -950,10 +961,10 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
                                                         pGraphic->GetPrefMapMode(),
                                                         MAP_100TH_MM );
             }
-            bPrevSym=TRUE;
+            bPrevSym=sal_True;
         }
     }
-    if(rAttrs.GetItemState(rAttrs.GetPool()->GetWhich(SID_ATTR_SYMBOLSIZE),TRUE,&pPoolItem) == SFX_ITEM_SET)
+    if(rAttrs.GetItemState(rAttrs.GetPool()->GetWhich(SID_ATTR_SYMBOLSIZE),sal_True,&pPoolItem) == SFX_ITEM_SET)
     {
         aSymbolSize = ((const SvxSizeItem *)pPoolItem)->GetSize();
     }
@@ -1032,7 +1043,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
     else if( rAttrs.GetItemState( XATTR_LINESTART ) != SFX_ITEM_DONTCARE )
     {
         // #86265# select entry using list and polygon, not string
-        sal_Bool bSelected(FALSE);
+        sal_Bool bSelected(sal_False);
         const basegfx::B2DPolyPolygon& rItemPolygon = ((const XLineStartItem&)rAttrs.Get(XATTR_LINESTART)).GetLineStartValue();
 
         for(sal_Int32 a(0);!bSelected &&  a < pLineEndList->Count(); a++)
@@ -1044,7 +1055,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
             {
                 // select this entry
                 aLbStartStyle.SelectEntryPos((sal_uInt16)a + 1);
-                bSelected = TRUE;
+                bSelected = sal_True;
             }
         }
 
@@ -1065,7 +1076,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
     else if( rAttrs.GetItemState( XATTR_LINEEND ) != SFX_ITEM_DONTCARE )
     {
         // #86265# select entry using list and polygon, not string
-        sal_Bool bSelected(FALSE);
+        sal_Bool bSelected(sal_False);
         const basegfx::B2DPolyPolygon& rItemPolygon = ((const XLineEndItem&)rAttrs.Get(XATTR_LINEEND)).GetLineEndValue();
 
         for(sal_Int32 a(0);!bSelected &&  a < pLineEndList->Count(); a++)
@@ -1077,7 +1088,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
             {
                 // select this entry
                 aLbEndStyle.SelectEntryPos((sal_uInt16)a + 1);
-                bSelected = TRUE;
+                bSelected = sal_True;
             }
         }
 
@@ -1125,7 +1136,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
     }
     else if( rAttrs.GetItemState( XATTR_LINESTARTCENTER ) != SFX_ITEM_DONTCARE )
     {
-        aTsbCenterStart.EnableTriState( FALSE );
+        aTsbCenterStart.EnableTriState( sal_False );
 
         if( ( ( const XLineStartCenterItem& ) rAttrs.Get( XATTR_LINESTARTCENTER ) ).GetValue() )
             aTsbCenterStart.SetState( STATE_CHECK );
@@ -1145,7 +1156,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
     }
     else if( rAttrs.GetItemState( XATTR_LINEENDCENTER ) != SFX_ITEM_DONTCARE )
     {
-        aTsbCenterEnd.EnableTriState( FALSE );
+        aTsbCenterEnd.EnableTriState( sal_False );
 
         if( ( ( const XLineEndCenterItem& ) rAttrs.Get( XATTR_LINEENDCENTER ) ).GetValue() )
             aTsbCenterEnd.SetState( STATE_CHECK );
@@ -1160,7 +1171,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
     // Transparenz
     if( rAttrs.GetItemState( XATTR_LINETRANSPARENCE ) != SFX_ITEM_DONTCARE )
     {
-        USHORT nTransp = ( ( const XLineTransparenceItem& ) rAttrs.
+        sal_uInt16 nTransp = ( ( const XLineTransparenceItem& ) rAttrs.
                                 Get( XATTR_LINETRANSPARENCE ) ).GetValue();
         aMtrTransparent.SetValue( nTransp );
         ChangeTransparentHdl_Impl( NULL );
@@ -1184,7 +1195,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
     // Synchronisieren
     // Jetzt wird der Wert aus der INI-Datei geholt (#42258#)
     String aStr = GetUserData();
-    aCbxSynchronize.Check( (BOOL)aStr.ToInt32() );
+    aCbxSynchronize.Check( (sal_Bool)aStr.ToInt32() );
 
     // #116827#
     if(bObjSelected && SFX_ITEM_DEFAULT == rAttrs.GetItemState(XATTR_LINEJOINT))
@@ -1240,7 +1251,7 @@ SfxTabPage* SvxLineTabPage::Create( Window* pWindow,
 
 //------------------------------------------------------------------------
 
-USHORT* SvxLineTabPage::GetRanges()
+sal_uInt16* SvxLineTabPage::GetRanges()
 {
     return( pLineRanges );
 }
@@ -1252,12 +1263,12 @@ IMPL_LINK( SvxLineTabPage, ChangePreviewHdl_Impl, void *, pCntrl )
     if(pCntrl == &aMtrLineWidth)
     {
         // Linienbreite und Start/EndBreite
-        INT32 nNewLineWidth = GetCoreValue( aMtrLineWidth, ePoolUnit );
+        sal_Int32 nNewLineWidth = GetCoreValue( aMtrLineWidth, ePoolUnit );
         if(nActLineWidth == -1)
         {
             // Noch nicht initialisiert, hole den Startwert
             const SfxPoolItem* pOld = GetOldItem( rXLSet, XATTR_LINEWIDTH );
-            INT32 nStartLineWidth = 0;
+            sal_Int32 nStartLineWidth = 0;
             if(pOld)
                 nStartLineWidth = (( const XLineWidthItem *)pOld)->GetValue();
             nActLineWidth = nStartLineWidth;
@@ -1266,8 +1277,8 @@ IMPL_LINK( SvxLineTabPage, ChangePreviewHdl_Impl, void *, pCntrl )
         if(nActLineWidth != nNewLineWidth)
         {
             // Anpassungen Start/EndWidth #63083#
-            INT32 nValAct = GetCoreValue( aMtrStartWidth, ePoolUnit );
-            INT32 nValNew = nValAct + (((nNewLineWidth - nActLineWidth) * 15) / 10);
+            sal_Int32 nValAct = GetCoreValue( aMtrStartWidth, ePoolUnit );
+            sal_Int32 nValNew = nValAct + (((nNewLineWidth - nActLineWidth) * 15) / 10);
             if(nValNew < 0)
                 nValNew = 0;
             SetMetricValue( aMtrStartWidth, nValNew, ePoolUnit );
@@ -1420,7 +1431,7 @@ IMPL_LINK( SvxLineTabPage, ChangeEndHdl_Impl, void *, p )
 
 IMPL_LINK( SvxLineTabPage, ChangeTransparentHdl_Impl, void *, EMPTYARG )
 {
-    UINT16 nVal = (UINT16)aMtrTransparent.GetValue();
+    sal_uInt16 nVal = (sal_uInt16)aMtrTransparent.GetValue();
     XLineTransparenceItem aItem( nVal );
 
     rXLSet.Put( XLineTransparenceItem( aItem ) );
@@ -1480,7 +1491,7 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton )
 
             SvxBmpItemInfo* pInfo = new SvxBmpItemInfo();
             pInfo->pBrushItem = pBrushItem;
-            pInfo->nItemId = (UINT16)(MN_GALLERY_ENTRY + i);
+            pInfo->nItemId = (sal_uInt16)(MN_GALLERY_ENTRY + i);
             aGrfBrushItems.Insert(pInfo, i);
             const Graphic* pGraphic = pBrushItem->GetGraphic();
 
@@ -1491,7 +1502,7 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton )
                 if(aSize.Width()  > MAX_BMP_WIDTH ||
                    aSize.Height() > MAX_BMP_HEIGHT)
                 {
-                    BOOL bWidth = aSize.Width() > aSize.Height();
+                    sal_Bool bWidth = aSize.Width() > aSize.Height();
                     double nScale = bWidth ?
                                         (double)MAX_BMP_WIDTH / (double)aSize.Width():
                                         (double)MAX_BMP_HEIGHT / (double)aSize.Height();
@@ -1509,7 +1520,7 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton )
         }
         aSymbolMB.GetPopupMenu()->SetPopupMenu( MN_GALLERY, pPopup );
         if(!aGrfNames.Count())
-            aSymbolMB.GetPopupMenu()->EnableItem(MN_GALLERY, FALSE);
+            aSymbolMB.GetPopupMenu()->EnableItem(MN_GALLERY, sal_False);
     }
 
     if(!pButton->GetPopupMenu()->GetPopupMenu( MN_SYMBOLS ) && pSymbolList)
@@ -1519,7 +1530,7 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton )
         SdrModel* pModel = new SdrModel(NULL, NULL, LOADREFCOUNTS);
         pModel->GetItemPool().FreezeIdRanges();
         // Page
-        SdrPage* pPage = new SdrPage( *pModel, FALSE );
+        SdrPage* pPage = new SdrPage( *pModel, sal_False );
         pPage->SetSize(Size(1000,1000));
         pModel->InsertPage( pPage, 0 );
         // 3D View
@@ -1559,13 +1570,13 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton )
 
             SvxBmpItemInfo* pInfo = new SvxBmpItemInfo();
             pInfo->pBrushItem = pBrushItem;
-            pInfo->nItemId = (UINT16)(MN_GALLERY_ENTRY + i + nNumMenuGalleryItems);
+            pInfo->nItemId = (sal_uInt16)(MN_GALLERY_ENTRY + i + nNumMenuGalleryItems);
             aGrfBrushItems.Insert(pInfo, nNumMenuGalleryItems + i);
 
             Size aSize(aBitmap.GetSizePixel());
             if(aSize.Width() > MAX_BMP_WIDTH || aSize.Height() > MAX_BMP_HEIGHT)
             {
-                BOOL bWidth = aSize.Width() > aSize.Height();
+                sal_Bool bWidth = aSize.Width() > aSize.Height();
                 double nScale = bWidth ?
                                     (double)MAX_BMP_WIDTH / (double)aSize.Width():
                                     (double)MAX_BMP_HEIGHT / (double)aSize.Height();
@@ -1576,7 +1587,7 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton )
         }
         aSymbolMB.GetPopupMenu()->SetPopupMenu( MN_SYMBOLS, pPopup );
         if(!aGrfNames.Count())
-            aSymbolMB.GetPopupMenu()->EnableItem(MN_SYMBOLS, FALSE);
+            aSymbolMB.GetPopupMenu()->EnableItem(MN_SYMBOLS, sal_False);
 
         delete pView;
         delete pModel;
@@ -1591,7 +1602,7 @@ IMPL_STATIC_LINK(SvxLineTabPage, GraphicArrivedHdl_Impl, SvxBrushItem*, pItem)
     PopupMenu* pPopup = pThis->aSymbolMB.GetPopupMenu()->GetPopupMenu( MN_GALLERY );
 
     SvxBmpItemInfo* pBmpInfo = 0;
-    for ( USHORT i = 0; i < pThis->aGrfBrushItems.Count(); i++ )
+    for ( sal_uInt16 i = 0; i < pThis->aGrfBrushItems.Count(); i++ )
     {
         SvxBmpItemInfo* pInfo = (SvxBmpItemInfo*)pThis->aGrfBrushItems.GetObject(i);
         if( pInfo->pBrushItem == pItem )
@@ -1608,7 +1619,7 @@ IMPL_STATIC_LINK(SvxLineTabPage, GraphicArrivedHdl_Impl, SvxBrushItem*, pItem)
             if(aSize.Width()  > MAX_BMP_WIDTH ||
                aSize.Height() > MAX_BMP_HEIGHT)
             {
-                BOOL bWidth = aSize.Width() > aSize.Height();
+                sal_Bool bWidth = aSize.Width() > aSize.Height();
                 double nScale = bWidth ?
                     (double)MAX_BMP_WIDTH / (double)aSize.Width():
                     (double)MAX_BMP_HEIGHT / (double)aSize.Height();
@@ -1626,12 +1637,12 @@ IMPL_STATIC_LINK(SvxLineTabPage, GraphicArrivedHdl_Impl, SvxBrushItem*, pItem)
 //Handler f�r Menuebutton
 IMPL_LINK( SvxLineTabPage, GraphicHdl_Impl, MenuButton *, pButton )
 {
-    USHORT nItemId = pButton->GetCurItemId();
+    sal_uInt16 nItemId = pButton->GetCurItemId();
     const Graphic* pGraphic = 0;
     Graphic aGraphic;
     String aGrfName;
-    BOOL bResetSize = FALSE;
-    BOOL bEnable=TRUE;
+    sal_Bool bResetSize = sal_False;
+    sal_Bool bEnable=sal_True;
     long nPreviousSymbolType = nSymbolType;
 
     if(nItemId >= MN_GALLERY_ENTRY)
@@ -1643,7 +1654,7 @@ IMPL_LINK( SvxLineTabPage, GraphicHdl_Impl, MenuButton *, pButton )
         else
         {
             nSymbolType=SVX_SYMBOLTYPE_BRUSHITEM;
-            bResetSize = TRUE;
+            bResetSize = sal_True;
         }
         SvxBmpItemInfo* pInfo = (SvxBmpItemInfo*)aGrfBrushItems.GetObject(nItemId - MN_GALLERY_ENTRY);
         pGraphic = pInfo->pBrushItem->GetGraphic();
@@ -1662,7 +1673,7 @@ IMPL_LINK( SvxLineTabPage, GraphicHdl_Impl, MenuButton *, pButton )
         {
             nSymbolType=SVX_SYMBOLTYPE_NONE;
             pGraphic=NULL;
-            bEnable=FALSE;
+            bEnable=sal_False;
         }
         break;
         default:
@@ -1678,7 +1689,7 @@ IMPL_LINK( SvxLineTabPage, GraphicHdl_Impl, MenuButton *, pButton )
                 {
                     nSymbolType=SVX_SYMBOLTYPE_BRUSHITEM;
                     pGraphic = &aGraphic;
-                    bResetSize = TRUE;
+                    bResetSize = sal_True;
                 }
             }
             if( !pGraphic )
@@ -1711,7 +1722,7 @@ IMPL_LINK( SvxLineTabPage, GraphicHdl_Impl, MenuButton *, pButton )
     {
         aSymbolGraphic=Graphic();
         aCtlPreview.SetSymbol(NULL,aSymbolSize);
-        bEnable=FALSE;
+        bEnable=sal_False;
     }
     aSymbolLastSize=aSymbolSize;
     SetMetricValue(aSymbolWidthMF,  aSymbolSize.Width(), ePoolUnit);
@@ -1728,9 +1739,9 @@ IMPL_LINK( SvxLineTabPage, GraphicHdl_Impl, MenuButton *, pButton )
 IMPL_LINK( SvxLineTabPage, SizeHdl_Impl, MetricField *, pField)
 {
     bNewSize=true;
-    BOOL bWidth = (BOOL)(pField == &aSymbolWidthMF);
+    sal_Bool bWidth = (sal_Bool)(pField == &aSymbolWidthMF);
     bLastWidthModified = bWidth;
-    BOOL bRatio = aSymbolRatioCB.IsChecked();
+    sal_Bool bRatio = aSymbolRatioCB.IsChecked();
     long nWidthVal = static_cast<long>(aSymbolWidthMF.Denormalize(aSymbolWidthMF.GetValue(FUNIT_100TH_MM)));
     long nHeightVal= static_cast<long>(aSymbolHeightMF.Denormalize(aSymbolHeightMF.GetValue(FUNIT_100TH_MM)));
     nWidthVal = OutputDevice::LogicToLogic(nWidthVal,MAP_100TH_MM,(MapUnit)ePoolUnit );
@@ -1821,7 +1832,7 @@ void SvxLineTabPage::PageCreated (SfxAllItemSet aSet)
 
     if(pSdrObjListItem) //symbols
     {
-        ShowSymbolControls(TRUE);
+        ShowSymbolControls(sal_True);
         pSymbolList = static_cast<SdrObjList*>(pSdrObjListItem->GetValue());
         if (pSymbolAttrItem)
             pSymbolAttr = new SfxItemSet(pSymbolAttrItem->GetItemSet());