CWS-TOOLING: integrate CWS vcl99

2009-01-29 15:34:04 +0100 hdu  r267149 : #i77520# fix AquaSalGraphics::GetGlyphBoundRect() result y-sign
2009-01-29 10:14:23 +0100 hdu  r267099 : #i77520# implement AquaSalGraphics::GetGlyphBoundRect()
2009-01-28 17:31:17 +0100 hdu  r267071 : #i79046# restore MultiSalLayout components after drawing them
2009-01-28 12:02:19 +0100 tl  r267050 : #78466# default curreny listbox for Arabic builds fixed
2009-01-28 11:54:21 +0100 tl  r267049 : #78466# default curreny listbox for Arabic builds fixed
2009-01-28 11:43:44 +0100 tl  r267047 : #78466# default curreny listbox for Arabic builds fixed
2009-01-28 11:17:42 +0100 tl  r267041 : #78466# default curreny listbox for Arabic builds fixed
2009-01-28 11:14:30 +0100 tl  r267038 : #78466# default curreny listbox for Arabic builds fixed
2009-01-28 10:33:03 +0100 tl  r267032 : #i72073# auto spellcheck markups in RTL context fixed
2009-01-28 09:26:00 +0100 tl  r267027 : #78466# default curreny listbox for Arabic builds fixed
2009-01-28 09:25:31 +0100 tl  r267026 : #78466# default curreny listbox for Arabic builds fixed
2009-01-27 16:55:14 +0100 tl  r267009 : #78466# default curreny listbox for Arabic builds fixed
2009-01-27 16:54:46 +0100 tl  r267008 : #78466# default curreny listbox for Arabic builds fixed
2009-01-27 16:52:23 +0100 tl  r267007 : #78466# default curreny listbox for Arabic builds fixed
2009-01-27 16:46:52 +0100 tl  r267006 : #i72073# auto spellcheck markups in RTL context fixed
2009-01-27 11:53:53 +0100 pl  r266975 : #i98515# fix a buffer overflow
2009-01-26 19:13:28 +0100 pl  r266946 : #i98119# add static vcl object helper
2009-01-26 18:11:06 +0100 pl  r266940 : #i94040# catch a corner case (thanks af)
2009-01-23 10:54:42 +0100 pl  r266793 : #i92102# fix some RTL UI issues
2009-01-23 10:53:35 +0100 pl  r266790 : #i98169# one more case of DrawWaveLine
2009-01-23 08:38:32 +0100 hdu  r266768 : #i98139# prefer Tools->Options->FontSubstitution over PreMatchHook
2009-01-21 17:30:57 +0100 pl  r266694 : #i92102# adjust spin buttons
2009-01-21 13:54:16 +0100 pl  r266667 : #i97130# add Click handler
2009-01-21 13:32:47 +0100 os  r266662 : #158646# set SwWrtShell in C'tor of SwIndexMarkDlg
2009-01-21 12:14:03 +0100 pl  r266649 : #i98196# fix autospellchecking in writer
2009-01-19 14:25:28 +0100 pl  r266497 : #i97130# implement functionality of ExplainButton

3 files changed, 13 insertions, 14 deletions

diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index 5c1f076cc7..9611493f2a 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -938,10 +938,10 @@ static void lcl_DrawLineForWrongListData(
             if (rInf.GetOut().GetConnectMetaFile())
                 rInf.GetOut().Push();
 
-            const Color aCol( rInf.GetOut().GetTextLineColor() );
+            const Color aCol( rInf.GetOut().GetLineColor() );
             const BOOL bColSave = aCol != aLineColor;
             if (bColSave)
-                rInf.GetOut().SetTextLineColor( aLineColor );
+                rInf.GetOut().SetLineColor( aLineColor );
 
             // iterate over all ranges stored in the respective SwWrongList
             do
@@ -1012,7 +1012,7 @@ static void lcl_DrawLineForWrongListData(
             while (nWrLen && pWList->Check( nStart, nWrLen ));
 
             if (bColSave)
-                rInf.GetOut().SetTextLineColor( aCol );
+                rInf.GetOut().SetLineColor( aCol );
 
             if (rInf.GetOut().GetConnectMetaFile())
                 rInf.GetOut().Pop();
@@ -1932,10 +1932,10 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
                             WRONG_SHOW_MEDIUM < nHght ? WAVE_NORMAL :
                             ( WRONG_SHOW_SMALL < nHght ? WAVE_SMALL :
                             WAVE_FLAT );
-                        Color aCol( rInf.GetOut().GetTextLineColor() );
+                        Color aCol( rInf.GetOut().GetLineColor() );
                         BOOL bColSave = aCol != *pWaveCol;
                         if ( bColSave )
-                            rInf.GetOut().SetTextLineColor( *pWaveCol );
+                            rInf.GetOut().SetLineColor( *pWaveCol );
 
                         Point aEnd;
                         long nKernVal = pKernArray[ USHORT( rInf.GetLen() - 1 ) ];
@@ -1982,7 +1982,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
                         rInf.GetOut().DrawWaveLine( aCurrPos, aEnd, nWave );
 
                         if ( bColSave )
-                            rInf.GetOut().SetTextLineColor( aCol );
+                            rInf.GetOut().SetLineColor( aCol );
 
                         if ( rInf.GetOut().GetConnectMetaFile() )
                             rInf.GetOut().Pop();
diff --git a/sw/source/ui/inc/swuiidxmrk.hxx b/sw/source/ui/inc/swuiidxmrk.hxx
index 692f1c8878..4ed098cc7a 100644
--- a/sw/source/ui/inc/swuiidxmrk.hxx
+++ b/sw/source/ui/inc/swuiidxmrk.hxx
@@ -166,7 +166,8 @@ public:
     SwIndexMarkDlg( Window *pParent,
                        sal_Bool bNewDlg,
                     const ResId& rResId,
-                    sal_Int32 _nOptionsId );
+                    sal_Int32 _nOptionsId,
+                    SwWrtShell& rWrtShell );
 
 
     ~SwIndexMarkDlg();
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index 893dd853b5..f65fe57f11 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -116,7 +116,7 @@ using namespace ::com::sun::star;
 SwIndexMarkDlg::SwIndexMarkDlg(Window *pParent,
                                sal_Bool bNewDlg,
                                const ResId& rResId,
-                               sal_Int32 _nOptionsId ) :
+                               sal_Int32 _nOptionsId, SwWrtShell& rWrtShell ) :
       Window(pParent, rResId),
     aTypeFT (this,  SW_RES(LBL_INDEX    )),
     aTypeDCB(this,  SW_RES(DCB_INDEX    )),
@@ -168,7 +168,7 @@ SwIndexMarkDlg::SwIndexMarkDlg(Window *pParent,
     bIsPhoneticReadingEnabled(FALSE),
     xExtendedIndexEntrySupplier(NULL),
     pTOXMgr(0),
-    pSh(0)
+    pSh(&rWrtShell)
 {
     if( SvtCJKOptions().IsCJKFontEnabled() )
     {
@@ -1124,12 +1124,10 @@ SwIndexMarkFloatDlg::SwIndexMarkFloatDlg(SfxBindings* _pBindings,
                                 SfxChildWinInfo* pInfo,
                                    sal_Bool bNew) :
 SfxModelessDialog(_pBindings, pChild, pParent, SvtCJKOptions().IsCJKFontEnabled()?SW_RES(DLG_INSIDXMARK_CJK):SW_RES(DLG_INSIDXMARK)),
-    aDlg(this, bNew, SW_RES(WIN_DLG), SvtCJKOptions().IsCJKFontEnabled()?DLG_INSIDXMARK_CJK:DLG_INSIDXMARK)
+    aDlg(this, bNew, SW_RES(WIN_DLG), SvtCJKOptions().IsCJKFontEnabled()?DLG_INSIDXMARK_CJK:DLG_INSIDXMARK, *::GetActiveWrtShell())
 {
     FreeResource();
-      SwWrtShell* pWrtShell = ::GetActiveWrtShell();
-      DBG_ASSERT(pWrtShell, "No shell?");
-      aDlg.ReInitDlg(*pWrtShell);
+    aDlg.ReInitDlg(*::GetActiveWrtShell());
     Initialize(pInfo);
 }
 /* -----------------06.10.99 10:27-------------------
@@ -1151,7 +1149,7 @@ void SwIndexMarkFloatDlg::ReInitDlg(SwWrtShell& rWrtShell)
  --------------------------------------------------*/
 SwIndexMarkModalDlg::SwIndexMarkModalDlg(Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark) :
 SvxStandardDialog(pParent, SvtCJKOptions().IsCJKFontEnabled()?SW_RES(DLG_EDIT_IDXMARK_CJK):SW_RES(DLG_EDIT_IDXMARK)),
-    aDlg(this, sal_False, SW_RES(WIN_DLG), SvtCJKOptions().IsCJKFontEnabled()?DLG_EDIT_IDXMARK_CJK:DLG_EDIT_IDXMARK)
+    aDlg(this, sal_False, SW_RES(WIN_DLG), SvtCJKOptions().IsCJKFontEnabled()?DLG_EDIT_IDXMARK_CJK:DLG_EDIT_IDXMARK, rSh)
 {
     FreeResource();
     aDlg.ReInitDlg(rSh, pCurTOXMark);