CWS-TOOLING: integrate CWS controltextrendering

9 files changed, 6 insertions, 350 deletions

diff --git a/svtools/inc/calendar.hxx b/svtools/inc/calendar.hxx
index 6f20a7f8c6c3..1c81945a669c 100644
--- a/svtools/inc/calendar.hxx
+++ b/svtools/inc/calendar.hxx
@@ -251,6 +251,7 @@ private:
     USHORT          mnDragScrollHitTest;
 
 #ifdef _SV_CALENDAR_CXX
+    using Control::ImplInitSettings;
     using Window::ImplInit;
     SVT_DLLPRIVATE void         ImplInit( WinBits nWinStyle );
     SVT_DLLPRIVATE void         ImplInitSettings();
diff --git a/svtools/inc/privsplt.hxx b/svtools/inc/privsplt.hxx
deleted file mode 100644
index 50a500de8848..000000000000
--- a/svtools/inc/privsplt.hxx
+++ /dev/null
@@ -1,86 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: privsplt.hxx,v $
- * $Revision: 1.3 $
- *
- * 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.
- *
- ************************************************************************/
-
-#ifndef _SV_PRIVSPLT_HXX
-#define _SV_PRIVSPLT_HXX
-
-#include <vcl/fixed.hxx>
-
-enum PRIVSPLIT_DIRECTION {PRIVSPLIT_HORZ,PRIVSPLIT_VERT };
-
-class SvPrivatSplit : public FixedLine
-{
-    private:
-
-        Link                aCtrModifiedLink;
-        BOOL                aMovingFlag;
-        Pointer             aWinPointer;
-        PRIVSPLIT_DIRECTION eAdrSplit;
-        short               nOldX;
-        short               nOldY;
-        short               nNewX;
-        short               nNewY;
-        short               nMinPos;
-        short               nMaxPos;
-        Range               aXMovingRange;
-        Range               aYMovingRange;
-        short               nDeltaX;
-        short               nDeltaY;
-        void                ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
-
-    protected:
-        virtual void        MouseButtonDown( const MouseEvent& rMEvt );
-        virtual void        Tracking( const TrackingEvent& rTEvt );
-
-    public:
-
-        SvPrivatSplit( Window* pWindow, const ResId& rResId,PRIVSPLIT_DIRECTION eAdrSplit);
-
-        SvPrivatSplit( Window* pParent,PRIVSPLIT_DIRECTION eAdrSplit, WinBits nStyle = 0);
-
-        virtual short   GetDeltaX();
-        virtual short   GetDeltaY();
-
-        virtual void    CtrModified();
-
-        void            SetXRange(Range cRgeX);
-        void            SetYRange(Range cRgeY);
-
-        void            MoveSplitTo(Point aPos);
-
-        virtual void    StateChanged( StateChangedType nType );
-        virtual void    DataChanged( const DataChangedEvent& rDCEvt );
-
-        void            SetCtrModifiedHdl( const Link& rLink ) { aCtrModifiedLink = rLink; }
-        const Link&     GetCtrModifiedHdl() const { return aCtrModifiedLink; }
-};
-
-
-#endif
diff --git a/svtools/inc/sectctr.hxx b/svtools/inc/sectctr.hxx
deleted file mode 100644
index da73e7aed4a7..000000000000
--- a/svtools/inc/sectctr.hxx
+++ /dev/null
@@ -1,154 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: sectctr.hxx,v $
- * $Revision: 1.4 $
- *
- * 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.
- *
- ************************************************************************/
-
-#ifndef _SV_SECTCTR_HXX
-#define _SV_SECTCTR_HXX
-
-#include <vcl/sv.h>
-#include <vcl/ctrl.hxx>
-
-class ImplSplitWindow;
-class ScrollBar;
-class ScrollBarBox;
-class SvSection;
-
-#define SECTION_APPEND      ((USHORT)0xFFFF)
-#define SECTION_NOTFOUND    ((USHORT)0xFFFF)
-
-#define WB_SECTION_STYLE    WB_VSCROLL | WB_HSCROLL | WB_TABSTOP
-
-class SvSectionControl : public Control
-{
-private:
-
-    Window              aSplitWinContainer;
-    ImplSplitWindow*    pSplitWin;
-    ScrollBar*          pVScrollBar;
-    ScrollBar*          pHScrollBar;
-    ScrollBarBox*       pScrollBarBox;
-    DockingWindow*      pDummy;
-    long                nRealHeight;
-    long                nMaxHeight;
-    long                nMinWidth;
-    Wallpaper           aWallpaper;
-
-    DECL_LINK( ScrollHdl, ScrollBar* );
-    DECL_LINK( EndScrollHdl, ScrollBar* );
-
-
-protected:
-
-    virtual void        Resize();
-    virtual void        Paint( const Rectangle& rRect );
-    virtual void        StateChanged( StateChangedType nStateChange );
-    virtual void        DataChanged( const DataChangedEvent& rDCEvt );
-    virtual void        Command( const CommandEvent& rCEvt );
-    virtual long        PreNotify( NotifyEvent& rNEvt );
-    virtual long        Notify( NotifyEvent& rNEvt );
-    virtual long        KeyEventNotify( const KeyEvent& rKEvt );
-    using Control::SetPosSizePixel;
-    virtual void        SetPosSizePixel( long nX, long nY,long nWidth, long nHeight,USHORT nFlags);
-
-
-
-    long                CalcMaxHeight();
-    long                CalcRealHeight();
-    long                CalcSectionWidth();
-
-    void                SetScrollBars(BOOL bVert,BOOL bHorz);
-    void                ShowScrollBarBox();
-    void                UpdateScrollBars();
-
-    BOOL                VScrollResize(Size &aSize);
-    BOOL                HScrollResize(Size &aSize);
-    void                SetChildPos(long nPos, BOOL bScrolling = TRUE);
-
-public:
-                        SvSectionControl( Window* pParent,WinBits nStyle = WB_SECTION_STYLE);
-                        SvSectionControl( Window* pParent, const ResId& rResId );
-                        ~SvSectionControl();
-
-
-    void                InsertSection(  USHORT nSectionId,SvSection* pSection,long nSize,USHORT nPos);
-    void                InsertSection(  USHORT nSectionId,SvSection* pSection,USHORT nPos);
-    void                RemoveSection( USHORT nSectionId );
-    void                Clear();
-
-    USHORT              GetSectionCount() const;
-    USHORT              GetSectionId( USHORT nPos ) const;
-    USHORT              GetSectionPos( USHORT nSectionId ) const;
-    USHORT              GetSectionId( const Point& rPos ) const;
-
-    void                SetSectionSize( USHORT nId, long nNewSize );
-    long                GetSectionSize( USHORT nId ) const;
-
-    /*
-    void                SetCurSectionId( USHORT nSectionId );
-    USHORT              GetCurSectionId() const;
-
-    void                SetFirstSectionId( USHORT nSectionId );
-    USHORT              GetFirstSectionId() const { return GetSectionId( mnFirstSectionPos ); }
-
-    void                MakeVisible( USHORT nSectionId );
-    */
-
-    void                SetSectionWidth( USHORT nSectionId, long nWidth);
-    long                GetSectionWidth( USHORT nSectionId ) const;
-
-    void                SetSection( USHORT nSectionId, SvSection* pPage );
-    SvSection*          GetSection( USHORT nSectionId ) const;
-
-    void                SetSectionText( USHORT nSectionId, const XubString& rText );
-    XubString           GetSectionText( USHORT nSectionId ) const;
-
-    void                SetHelpText( USHORT nSectionId, const XubString& rText );
-    const XubString&    GetHelpText( USHORT nSectionId ) const;
-
-    void                SetHelpId( USHORT nSectionId, ULONG nHelpId );
-    ULONG               GetHelpId( USHORT nSectionId ) const;
-
-    void                SetHelpText( const XubString& rText )
-                            { Control::SetHelpText( rText ); }
-    const XubString&    GetHelpText() const
-                            { return Control::GetHelpText(); }
-
-    void                SetHelpId( ULONG nId )
-                            { Control::SetHelpId( nId ); }
-    ULONG               GetHelpId() const
-                            { return Control::GetHelpId(); }
-
-    using Control::SetBackground;
-    void                SetBackground( const Wallpaper& rBackground ){aWallpaper=rBackground; }
-    const Wallpaper&    GetBackground() const { return aWallpaper; }
-
-};
-
-
-#endif
diff --git a/svtools/inc/svtools/editbrowsebox.hxx b/svtools/inc/svtools/editbrowsebox.hxx
index c72c7c54f877..60fcbc9efb1a 100644
--- a/svtools/inc/svtools/editbrowsebox.hxx
+++ b/svtools/inc/svtools/editbrowsebox.hxx
@@ -675,6 +675,7 @@ namespace svt
     private:
         virtual void PaintField(OutputDevice& rDev, const Rectangle& rRect,
                                 sal_uInt16 nColumnId ) const;
+        using Control::ImplInitSettings;
         SVT_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground );
         SVT_DLLPRIVATE void DetermineFocus( const sal_uInt16 _nGetFocusFlags = 0);
         inline void HideAndDisable(CellControllerRef& rController);
diff --git a/svtools/inc/svtools/section.hxx b/svtools/inc/svtools/section.hxx
deleted file mode 100644
index 48941d06b7ca..000000000000
--- a/svtools/inc/svtools/section.hxx
+++ /dev/null
@@ -1,104 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: section.hxx,v $
- * $Revision: 1.3 $
- *
- * 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.
- *
- ************************************************************************/
-
-#ifndef _SV_SECTION_HXX
-#define _SV_SECTION_HXX
-
-#include <vcl/sv.h>
-#include <vcl/ctrl.hxx>
-#include <vcl/dockwin.hxx>
-#include <vcl/tabpage.hxx>
-#include <svtools/expander.hxx>
-#include <svtools/privsplt.hxx>
-
-class SvSectionControl;
-
-class SvSection : public DockingWindow
-{
-private:
-        SvSectionControl*       pSectionControl;
-        USHORT                  nSectionID;
-        Window*                 pChildWin;
-        XubString               aName;
-        long                    nHeight;
-        long                    nMinHeight;
-        long                    nMinWidth;
-        long                    nOldHeight;
-
-        DECL_LINK( ToggleHdl,   SvExpander* );
-        DECL_LINK( SplitHdl,    SvPrivatSplit* );
-
-        void                    ImplExpandSection();
-        void                    ImplShrinkSection();
-
-protected:
-        SvExpander              aExpander;
-        Window                  aChildWinContainer;
-        SvPrivatSplit           aPrivatSplit;
-
-        virtual void            Resize();
-        virtual void            Paint( const Rectangle& rRect );
-        virtual long            Notify( NotifyEvent& rNEvt );
-
-public:
-        SvSection(const XubString& rName,SvSectionControl* pParent,
-                    WinBits nStyle = 0);
-        SvSection(const XubString& rName,SvSectionControl* pParent,
-                    Window* pChildWin, WinBits nStyle = 0);
-
-        virtual void            SetScrollPos(long nPos);
-        void                    SetChildPos(long nPos);
-
-        void                    SetSectionControl(SvSectionControl* pParent);
-        const SvSectionControl* GetSectionControl()const ;
-        void                    SetSectionText( const XubString& );
-        const XubString&            GetSectionText() const {return aName;}
-
-        void                    SetChildWin(Window* pChildWin);
-        Window*                 GetChildWin() const {return pChildWin;}
-
-        void                    SetSectionID(USHORT nId) {nSectionID=nId;}
-        USHORT                  GetSectionID() const {return nSectionID;}
-
-        void                    SetMaxHeight(long nHeight);
-        long                    GetMaxHeight();
-
-        void                    SetMinHeight(long nHeight);
-        long                    GetMinHeight();
-
-        void                    SetMinWidth(long nWidth);
-        long                    GetMinWidth();
-
-        void                    ExpandSection();
-        void                    ShrinkSection();
-        BOOL                    IsExpanded();
-};
-
-#endif
diff --git a/svtools/inc/svtools/svmedit.hxx b/svtools/inc/svtools/svmedit.hxx
index b1e0d368c9ba..ccf77299965c 100644
--- a/svtools/inc/svtools/svmedit.hxx
+++ b/svtools/inc/svtools/svmedit.hxx
@@ -61,6 +61,7 @@ protected:
     void            DataChanged( const DataChangedEvent& rDCEvt );
     virtual long    PreNotify( NotifyEvent& rNEvt );
     long            Notify( NotifyEvent& rNEvt );
+    using Control::ImplInitSettings;
     void            ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
     WinBits         ImplInitStyle( WinBits nStyle );
 
diff --git a/svtools/inc/svtools/valueset.hxx b/svtools/inc/svtools/valueset.hxx
index 647851008c8f..fc12f9517b6d 100644
--- a/svtools/inc/svtools/valueset.hxx
+++ b/svtools/inc/svtools/valueset.hxx
@@ -285,6 +285,7 @@ private:
 #ifdef _SV_VALUESET_CXX
     friend class ValueSetAcc;
     friend class ValueItemAcc;
+    using Control::ImplInitSettings;
     using Window::ImplInit;
     SVT_DLLPRIVATE void         ImplInit();
     SVT_DLLPRIVATE void         ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
diff --git a/svtools/prj/d.lst b/svtools/prj/d.lst
index 3dc9c0b013bb..aebe1dabc908 100644
--- a/svtools/prj/d.lst
+++ b/svtools/prj/d.lst
@@ -210,9 +210,6 @@ mkdir: %_DEST%\inc%_EXT%\svtools
 ..\inc\instrm.hxx %_DEST%\inc%_EXT%\svtools\instrm.hxx
 ..\inc\outstrm.hxx %_DEST%\inc%_EXT%\svtools\outstrm.hxx
 
-..\inc\svtools\section.hxx %_DEST%\inc%_EXT%\svtools\section.hxx
-..\inc\sectctr.hxx %_DEST%\inc%_EXT%\svtools\sectctr.hxx
-..\inc\privsplt.hxx %_DEST%\inc%_EXT%\svtools\privsplt.hxx
 ..\inc\expander.hxx %_DEST%\inc%_EXT%\svtools\expander.hxx
 ..\source\svsql\converter.hxx %_DEST%\inc%_EXT%\svtools\converter.hxx
 
diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx
index b3b5829b479e..916738af70ae 100644
--- a/svtools/source/contnr/ivctrl.cxx
+++ b/svtools/source/contnr/ivctrl.cxx
@@ -579,8 +579,7 @@ Rectangle SvtIconChoiceCtrl::GetBoundingBox( SvxIconChoiceCtrlEntry* pEntry ) co
 
 void SvtIconChoiceCtrl::FillLayoutData() const
 {
-    DBG_ASSERT( !mpLayoutData, "SvtIconChoiceCtrl::FillLayoutData: shouldn't this be called with non-existent layout data only?" );
-    mpLayoutData = new ::vcl::ControlLayoutData();
+    CreateLayoutData();
 
     SvtIconChoiceCtrl* pNonConstMe = const_cast< SvtIconChoiceCtrl* >( this );
 
@@ -598,7 +597,7 @@ void SvtIconChoiceCtrl::FillLayoutData() const
         sal_Bool bLargeIconMode = WB_ICON == ( _pImp->GetStyle() & ( VIEWMODE_MASK ) );
         sal_uInt16 nTextPaintFlags = bLargeIconMode ? PAINTFLAG_HOR_CENTERED : PAINTFLAG_VER_CENTERED;
 
-        _pImp->PaintItem( aTextRect, IcnViewFieldTypeText, pEntry, nTextPaintFlags, pNonConstMe, &sEntryText, mpLayoutData );
+        _pImp->PaintItem( aTextRect, IcnViewFieldTypeText, pEntry, nTextPaintFlags, pNonConstMe, &sEntryText, GetLayoutData() );
 
         ++nPos;
     }