VCL: complete reorganization of text and font functions in outdev.hxx

Change-Id: I7dbd9ec79213d43acf6486a2507c8f0cfb47d943

2 files changed, 238 insertions, 209 deletions

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index c954e64f9c30..28af36433983 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -468,7 +468,7 @@ public:
 
     /** Query an OutputDevice to see whether it supports a specific operation
 
-    @return true if operation supported, else false
+     @returns true if operation supported, else false
     */
     bool                        supportsOperation( OutDevSupportType ) const;
 
@@ -479,7 +479,7 @@ public:
 
 private:
 
-    void                        ImplRotatePos( long nOriginX, long nOriginY, long& rX, long &rY,
+    SAL_DLLPRIVATE void         ImplRotatePos( long nOriginX, long nOriginY, long& rX, long &rY,
                                                short nOrientation ) const;
     ///@}
 
@@ -528,6 +528,7 @@ private:
     /** @name OutputDevice state functions
      */
     ///@{
+
 public:
 
     void                        Push( sal_uInt16 nFlags = PUSH_ALL );
@@ -889,82 +890,127 @@ private:
     ///@{
 
 public:
-    SystemTextLayoutData        GetSysTextLayoutData( const Point& rStartPt, const OUString& rStr,
-                                                      sal_Int32 nIndex = 0, sal_Int32 nLen = -1,
-                                                      const sal_Int32* pDXAry = NULL ) const;
 
-    SAL_DLLPRIVATE bool         ImplNewFont() const;
-    SAL_DLLPRIVATE void         ImplInitTextColor();
-    static
-    SAL_DLLPRIVATE void         ImplDrawText( OutputDevice& rTargetDevice, const Rectangle& rRect,
+    void                        DrawText( const Point& rStartPt, const OUString& rStr,
+                                          sal_Int32 nIndex = 0, sal_Int32 nLen = -1,
+                                          MetricVector* pVector = NULL, OUString* pDisplayText = NULL );
+
+    void                        DrawText( const Rectangle& rRect,
+                                          const OUString& rStr, sal_uInt16 nStyle = 0,
+                                          MetricVector* pVector = NULL, OUString* pDisplayText = NULL,
+                                          ::vcl::ITextLayout* _pTextLayout = NULL );
+
+    void                        ImplDrawText( OutputDevice& rTargetDevice, const Rectangle& rRect,
                                               const OUString& rOrigStr, sal_uInt16 nStyle,
                                               MetricVector* pVector, OUString* pDisplayText, ::vcl::ITextLayout& _rLayout );
-    SAL_DLLPRIVATE void         ImplDrawTextBackground( const SalLayout& );
-    SAL_DLLPRIVATE void         ImplDrawTextLines( SalLayout&, FontStrikeout eStrikeout, FontUnderline eUnderline, FontUnderline eOverline, bool bWordLine, bool bUnderlineAbove );
-    SAL_DLLPRIVATE bool         ImplDrawRotateText( SalLayout& );
-    SAL_DLLPRIVATE bool         ImplDrawTextDirect( SalLayout&, bool bTextLines, sal_uInt32 flags = 0 );
-    SAL_DLLPRIVATE void         ImplDrawSpecialText( SalLayout& );
-    SAL_DLLPRIVATE void         ImplDrawText( SalLayout& );
-    SAL_DLLPRIVATE Rectangle    ImplGetTextBoundRect( const SalLayout& );
-    SAL_DLLPRIVATE void         ImplDrawTextRect( long nBaseX, long nBaseY, long nX, long nY, long nWidth, long nHeight );
 
-    SAL_DLLPRIVATE void         ImplInitTextLineSize();
-    SAL_DLLPRIVATE void         ImplInitAboveTextLineSize();
+    void                        ImplDrawText( SalLayout& );
 
-    SAL_DLLPRIVATE void         ImplDrawWavePixel( long nOriginX, long nOriginY, long nCurX, long nCurY, short nOrientation, SalGraphics* pGraphics, OutputDevice* pOutDev,
-                                                   bool bDrawPixAsRect, long nPixWidth, long nPixHeight );
-    SAL_DLLPRIVATE void         ImplDrawWaveLine( long nBaseX, long nBaseY, long nStartX, long nStartY, long nWidth, long nHeight, long nLineWidth, short nOrientation, const Color& rColor );
-    SAL_DLLPRIVATE void         ImplDrawWaveTextLine( long nBaseX, long nBaseY, long nX, long nY, long nWidth, FontUnderline eTextLine, Color aColor, bool bIsAbove );
-    SAL_DLLPRIVATE void         ImplDrawStraightTextLine( long nBaseX, long nBaseY, long nX, long nY, long nWidth, FontUnderline eTextLine, Color aColor, bool bIsAbove );
-    SAL_DLLPRIVATE void         ImplDrawStrikeoutLine( long nBaseX, long nBaseY, long nX, long nY, long nWidth, FontStrikeout eStrikeout, Color aColor );
-    SAL_DLLPRIVATE void         ImplDrawStrikeoutChar( long nBaseX, long nBaseY, long nX, long nY, long nWidth, FontStrikeout eStrikeout, Color aColor );
-    SAL_DLLPRIVATE void         ImplDrawTextLine( long nBaseX, long nX, long nY, long nWidth, FontStrikeout eStrikeout, FontUnderline eUnderline, FontUnderline eOverline, bool bUnderlineAbove );
-    SAL_DLLPRIVATE void         ImplDrawMnemonicLine( long nX, long nY, long nWidth );
-    SAL_DLLPRIVATE static bool  ImplIsUnderlineAbove( const Font& );
+    void                        ImplDrawTextBackground( const SalLayout& );
 
-    static
-    SAL_DLLPRIVATE long         ImplGetTextLines( ImplMultiTextLineInfo& rLineInfo, long nWidth, const OUString& rStr, sal_uInt16 nStyle, const ::vcl::ITextLayout& _rLayout );
-    SAL_DLLPRIVATE void         ImplInitFontList() const;
-    SAL_DLLPRIVATE void         ImplUpdateFontData( bool bNewFontLists );
-    SAL_DLLPRIVATE static void  ImplUpdateAllFontData( bool bNewFontLists );
+    void                        DrawCtrlText( const Point& rPos, const OUString& rStr,
+                                              sal_Int32 nIndex = 0, sal_Int32 nLen = -1,
+                                              sal_uInt16 nStyle = TEXT_DRAW_MNEMONIC, MetricVector* pVector = NULL, OUString* pDisplayText = NULL );
+
+    void                        DrawTextLine( const Point& rPos, long nWidth,
+                                              FontStrikeout eStrikeout,
+                                              FontUnderline eUnderline,
+                                              FontUnderline eOverline,
+                                              bool bUnderlineAbove = false );
+
+    void                        ImplDrawTextLine( long nBaseX, long nX, long nY, long nWidth, FontStrikeout eStrikeout, FontUnderline eUnderline, FontUnderline eOverline, bool bUnderlineAbove );
+
+    void                        ImplDrawTextLines( SalLayout&, FontStrikeout eStrikeout, FontUnderline eUnderline, FontUnderline eOverline, bool bWordLine, bool bUnderlineAbove );
+
+    void                        DrawWaveLine( const Point& rStartPos, const Point& rEndPos );
+
+    bool                        ImplDrawRotateText( SalLayout& );
+
+    Rectangle                   GetTextRect( const Rectangle& rRect,
+                                             const OUString& rStr, sal_uInt16 nStyle = TEXT_DRAW_WORDBREAK,
+                                             TextRectInfo* pInfo = NULL,
+                                             const ::vcl::ITextLayout* _pTextLayout = NULL ) const;
+
+    bool                        GetTextBoundRect( Rectangle& rRect,
+                                                  const OUString& rStr, sal_Int32 nBase = 0, sal_Int32 nIndex = 0, sal_Int32 nLen = -1,
+                                                  sal_uLong nLayoutWidth = 0, const sal_Int32* pDXArray = NULL ) const;
+
+    Rectangle                   ImplGetTextBoundRect( const SalLayout& );
+
+    bool                        GetTextOutline( PolyPolygon&,
+                                                const OUString& rStr, sal_Int32 nBase = 0, sal_Int32 nIndex = 0,
+                                                sal_Int32 nLen = -1, bool bOptimize = true,
+                                                sal_uLong nLayoutWidth = 0, const sal_Int32* pDXArray = NULL ) const;
+
+    bool                        GetTextOutlines( PolyPolyVector&,
+                                                 const OUString& rStr, sal_Int32 nBase = 0, sal_Int32 nIndex = 0,
+                                                 sal_Int32 nLen = -1, bool bOptimize = true,
+                                                 sal_uLong nLayoutWidth = 0, const sal_Int32* pDXArray = NULL ) const;
+
+    bool                        GetTextOutlines( ::basegfx::B2DPolyPolygonVector &rVector,
+                                                 const OUString& rStr, sal_Int32 nBase = 0, sal_Int32 nIndex = 0,
+                                                 sal_Int32 nLen = -1, bool bOptimize = true,
+                                                 sal_uLong nLayoutWidth = 0, const sal_Int32* pDXArray = NULL ) const;
+
+
+    OUString                    GetEllipsisString( const OUString& rStr, long nMaxWidth,
+                                                   sal_uInt16 nStyle = TEXT_DRAW_ENDELLIPSIS ) const;
+
+    long                        GetCtrlTextWidth( const OUString& rStr, sal_Int32 nIndex = 0,
+                                                  sal_Int32 nLen = -1,
+                                                  sal_uInt16 nStyle = TEXT_DRAW_MNEMONIC ) const;
+
+    static OUString             GetNonMnemonicString( const OUString& rStr, sal_Int32& rMnemonicPos );
+
+    static OUString             GetNonMnemonicString( const OUString& rStr )
+                                            { sal_Int32 nDummy; return GetNonMnemonicString( rStr, nDummy ); }
+
+    /** Generate MetaTextActions for the text rect
+
+        This method splits up the text rect into multiple
+        MetaTextActions, one for each line of text. This is comparable
+        to AddGradientActions(), which splits up a gradient into its
+        constituent polygons. Parameter semantics fully compatible to
+        DrawText().
+     */
+    void                        AddTextRectActions( const Rectangle& rRect,
+                                                    const OUString&    rOrigStr,
+                                                    sal_uInt16           nStyle,
+                                                    GDIMetaFile&     rMtf );
 
     void                        SetTextColor( const Color& rColor );
     const Color&                GetTextColor() const { return maTextColor; }
+
     void                        SetTextFillColor();
     void                        SetTextFillColor( const Color& rColor );
-
     Color                       GetTextFillColor() const;
     bool                        IsTextFillColor() const { return !maFont.IsTransparent(); }
+
     void                        SetTextLineColor();
     void                        SetTextLineColor( const Color& rColor );
     const Color&                GetTextLineColor() const { return maTextLineColor; }
     bool                        IsTextLineColor() const { return (maTextLineColor.GetTransparency() == 0); }
+
     void                        SetOverlineColor();
     void                        SetOverlineColor( const Color& rColor );
     const Color&                GetOverlineColor() const { return maOverlineColor; }
     bool                        IsOverlineColor() const { return (maOverlineColor.GetTransparency() == 0); }
+
     void                        SetTextAlign( TextAlign eAlign );
     TextAlign                   GetTextAlign() const { return maFont.GetAlign(); }
 
-    void                        DrawTextLine( const Point& rPos, long nWidth,
-                                              FontStrikeout eStrikeout,
-                                              FontUnderline eUnderline,
-                                              FontUnderline eOverline,
-                                              bool bUnderlineAbove = false );
-
-    void                        DrawText( const Point& rStartPt, const OUString& rStr,
-                                          sal_Int32 nIndex = 0, sal_Int32 nLen = -1,
-                                          MetricVector* pVector = NULL, OUString* pDisplayText = NULL );
     long                        GetTextWidth( const OUString& rStr, sal_Int32 nIndex = 0, sal_Int32 nLen = -1 ) const;
     /// Height where any character of the current font fits; in logic coordinates.
     long                        GetTextHeight() const;
     float                       approximate_char_width() const;
+
     void                        DrawTextArray( const Point& rStartPt, const OUString& rStr,
                                                const sal_Int32* pDXAry = NULL,
                                                sal_Int32 nIndex = 0,
                                                sal_Int32 nLen = -1 );
     long                        GetTextArray( const OUString& rStr, sal_Int32* pDXAry = NULL,
                                               sal_Int32 nIndex = 0, sal_Int32 nLen = -1 ) const;
+
     bool                        GetCaretPositions( const OUString&, sal_Int32* pCaretXArray,
                                               sal_Int32 nIndex, sal_Int32 nLen,
                                               sal_Int32* pDXAry = NULL, long nWidth = 0,
@@ -979,58 +1025,31 @@ public:
                                               sal_Unicode nExtraChar, sal_Int32& rExtraCharPos,
                                               sal_Int32 nIndex, sal_Int32 nLen,
                                               long nCharExtra = 0 ) const;
-    /** Generate MetaTextActions for the text rect
 
-        This method splits up the text rect into multiple
-        MetaTextActions, one for each line of text. This is comparable
-        to AddGradientActions(), which splits up a gradient into its
-        constituent polygons. Parameter semantics fully compatible to
-        DrawText().
-     */
-    void                        AddTextRectActions( const Rectangle& rRect,
-                                                    const OUString&    rOrigStr,
-                                                    sal_uInt16           nStyle,
-                                                    GDIMetaFile&     rMtf );
-    void                        DrawText( const Rectangle& rRect,
-                                          const OUString& rStr, sal_uInt16 nStyle = 0,
-                                          MetricVector* pVector = NULL, OUString* pDisplayText = NULL,
-                                          ::vcl::ITextLayout* _pTextLayout = NULL );
-    Rectangle                   GetTextRect( const Rectangle& rRect,
-                                             const OUString& rStr, sal_uInt16 nStyle = TEXT_DRAW_WORDBREAK,
-                                             TextRectInfo* pInfo = NULL,
-                                             const ::vcl::ITextLayout* _pTextLayout = NULL ) const;
-    OUString                    GetEllipsisString( const OUString& rStr, long nMaxWidth,
-                                                   sal_uInt16 nStyle = TEXT_DRAW_ENDELLIPSIS ) const;
-    void                        DrawCtrlText( const Point& rPos, const OUString& rStr,
-                                              sal_Int32 nIndex = 0, sal_Int32 nLen = -1,
-                                              sal_uInt16 nStyle = TEXT_DRAW_MNEMONIC, MetricVector* pVector = NULL, OUString* pDisplayText = NULL );
-    long                        GetCtrlTextWidth( const OUString& rStr, sal_Int32 nIndex = 0,
-                                                  sal_Int32 nLen = -1,
-                                                  sal_uInt16 nStyle = TEXT_DRAW_MNEMONIC ) const;
-    static OUString             GetNonMnemonicString( const OUString& rStr, sal_Int32& rMnemonicPos );
-    static OUString             GetNonMnemonicString( const OUString& rStr )
-                                            { sal_Int32 nDummy; return GetNonMnemonicString( rStr, nDummy ); }
+private:
+    SAL_DLLPRIVATE void         ImplInitTextColor();
 
-    bool                        GetTextBoundRect( Rectangle& rRect,
-                                                  const OUString& rStr, sal_Int32 nBase = 0, sal_Int32 nIndex = 0, sal_Int32 nLen = -1,
-                                                  sal_uLong nLayoutWidth = 0, const sal_Int32* pDXArray = NULL ) const;
+    SAL_DLLPRIVATE void         ImplInitTextLineSize();
+    SAL_DLLPRIVATE void         ImplInitAboveTextLineSize();
 
-    bool                        GetTextOutline( PolyPolygon&,
-                                                const OUString& rStr, sal_Int32 nBase = 0, sal_Int32 nIndex = 0,
-                                                sal_Int32 nLen = -1, bool bOptimize = true,
-                                                sal_uLong nLayoutWidth = 0, const sal_Int32* pDXArray = NULL ) const;
 
-    bool                        GetTextOutlines( PolyPolyVector&,
-                                                 const OUString& rStr, sal_Int32 nBase = 0, sal_Int32 nIndex = 0,
-                                                 sal_Int32 nLen = -1, bool bOptimize = true,
-                                                 sal_uLong nLayoutWidth = 0, const sal_Int32* pDXArray = NULL ) const;
+    SAL_DLLPRIVATE bool         ImplDrawTextDirect( SalLayout&, bool bTextLines, sal_uInt32 flags = 0 );
+    SAL_DLLPRIVATE void         ImplDrawSpecialText( SalLayout& );
+    SAL_DLLPRIVATE void         ImplDrawTextRect( long nBaseX, long nBaseY, long nX, long nY, long nWidth, long nHeight );
 
-    bool                        GetTextOutlines( ::basegfx::B2DPolyPolygonVector &rVector,
-                                                 const OUString& rStr, sal_Int32 nBase = 0, sal_Int32 nIndex = 0,
-                                                 sal_Int32 nLen = -1, bool bOptimize = true,
-                                                 sal_uLong nLayoutWidth = 0, const sal_Int32* pDXArray = NULL ) const;
+    SAL_DLLPRIVATE void         ImplDrawWavePixel( long nOriginX, long nOriginY, long nCurX, long nCurY, short nOrientation, SalGraphics* pGraphics, OutputDevice* pOutDev,
+                                                   bool bDrawPixAsRect, long nPixWidth, long nPixHeight );
+    SAL_DLLPRIVATE void         ImplDrawWaveLine( long nBaseX, long nBaseY, long nStartX, long nStartY, long nWidth, long nHeight, long nLineWidth, short nOrientation, const Color& rColor );
+    SAL_DLLPRIVATE void         ImplDrawWaveTextLine( long nBaseX, long nBaseY, long nX, long nY, long nWidth, FontUnderline eTextLine, Color aColor, bool bIsAbove );
+    SAL_DLLPRIVATE void         ImplDrawStraightTextLine( long nBaseX, long nBaseY, long nX, long nY, long nWidth, FontUnderline eTextLine, Color aColor, bool bIsAbove );
+    SAL_DLLPRIVATE void         ImplDrawStrikeoutLine( long nBaseX, long nBaseY, long nX, long nY, long nWidth, FontStrikeout eStrikeout, Color aColor );
+    SAL_DLLPRIVATE void         ImplDrawStrikeoutChar( long nBaseX, long nBaseY, long nX, long nY, long nWidth, FontStrikeout eStrikeout, Color aColor );
+    SAL_DLLPRIVATE void         ImplDrawMnemonicLine( long nX, long nY, long nWidth );
 
-    void                        DrawWaveLine( const Point& rStartPos, const Point& rEndPos );
+    SAL_DLLPRIVATE static bool  ImplIsUnderlineAbove( const Font& );
+
+    static
+    SAL_DLLPRIVATE long         ImplGetTextLines( ImplMultiTextLineInfo& rLineInfo, long nWidth, const OUString& rStr, sal_uInt16 nStyle, const ::vcl::ITextLayout& _rLayout );
     ///@}
 
 
@@ -1099,6 +1118,10 @@ public:
                                                 sal_uLong nFlags,
                                                 const OutputDevice* pOutDev = NULL );
 
+    SAL_DLLPRIVATE void         ImplInitFontList() const;
+    SAL_DLLPRIVATE void         ImplUpdateFontData( bool bNewFontLists );
+    SAL_DLLPRIVATE static void  ImplUpdateAllFontData( bool bNewFontLists );
+
 protected:
 
     virtual void                InitFont() const;
@@ -1111,6 +1134,8 @@ private:
 
     typedef void ( OutputDevice::* FontUpdateHandler_t )( bool );
 
+    SAL_DLLPRIVATE bool         ImplNewFont() const;
+
     SAL_DLLPRIVATE void         ImplClearFontData( bool bNewFontLists );
     SAL_DLLPRIVATE void         ImplRefreshFontData( bool bNewFontLists );
     SAL_DLLPRIVATE static void  ImplUpdateFontDataForAllFrames( FontUpdateHandler_t pHdl, bool bNewFontLists );
@@ -1130,6 +1155,10 @@ private:
 
 public:
 
+    SystemTextLayoutData        GetSysTextLayoutData( const Point& rStartPt, const OUString& rStr,
+                                                      sal_Int32 nIndex = 0, sal_Int32 nLen = -1,
+                                                      const sal_Int32* pDXAry = NULL ) const;
+
     SAL_DLLPRIVATE bool         ImplIsAntiparallel() const ;
     SAL_DLLPRIVATE void         ReMirror( Point &rPoint ) const;
     SAL_DLLPRIVATE void         ReMirror( Rectangle &rRect ) const;
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 1d22db81256d..cf512c4dd504 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -101,98 +101,26 @@ $(eval $(call gb_Library_use_externals,vcl,\
 ))
 
 $(eval $(call gb_Library_add_exception_objects,vcl,\
-    vcl/source/app/brand \
-    vcl/source/app/dbggui \
-    vcl/source/app/dndhelp \
-    vcl/source/app/help \
-    vcl/source/app/i18nhelp \
-    vcl/source/app/idlemgr \
-    vcl/source/app/salvtables \
-    vcl/source/app/session \
-    vcl/source/app/settings \
-    vcl/source/app/IconThemeInfo \
-    vcl/source/app/IconThemeScanner \
-    vcl/source/app/IconThemeSelector \
-    vcl/source/app/sound \
-    vcl/source/app/stdtext \
-    vcl/source/app/svapp \
-    vcl/source/app/svdata \
-    vcl/source/app/svmain \
-    vcl/source/app/svmainhook \
-    vcl/source/app/timer \
-    vcl/source/app/unohelp2 \
-    vcl/source/app/unohelp \
-    vcl/source/app/vclevent \
-    vcl/source/components/dtranscomp \
-    vcl/source/components/factory \
-    vcl/source/components/fontident \
-    vcl/source/control/button \
-    vcl/source/control/combobox \
-    vcl/source/control/ctrl \
-    vcl/source/control/edit \
-    vcl/source/control/field2 \
-    vcl/source/control/field \
-    vcl/source/control/fixed \
-    vcl/source/control/fixedhyper \
-    vcl/source/control/group \
-    vcl/source/control/ilstbox \
-    vcl/source/control/imgctrl \
-    vcl/source/control/longcurr \
-    vcl/source/control/lstbox \
-    vcl/source/control/menubtn \
-    vcl/source/control/morebtn \
-    vcl/source/control/quickselectionengine \
-    vcl/source/control/prgsbar \
-    vcl/source/control/scrbar \
-    vcl/source/control/slider \
-    vcl/source/control/spinbtn \
-    vcl/source/control/spinfld \
-    vcl/source/control/tabctrl \
-    vcl/source/control/throbber \
-    vcl/source/edit/vclmedit \
-    vcl/source/edit/textdata \
-    vcl/source/edit/textdoc \
-    vcl/source/edit/texteng \
-    vcl/source/edit/textundo \
-    vcl/source/edit/textview \
-    vcl/source/edit/txtattr \
-    vcl/source/edit/xtextedt \
-    vcl/source/filter/FilterConfigCache \
-    vcl/source/filter/FilterConfigItem \
-    vcl/source/filter/graphicfilter \
-    vcl/source/filter/graphicfilter2 \
-    vcl/source/filter/GraphicNativeTransform \
-    vcl/source/filter/GraphicNativeMetadata \
-    vcl/source/filter/sgfbram \
-    vcl/source/filter/sgvmain \
-    vcl/source/filter/sgvspln \
-    vcl/source/filter/sgvtext \
-    vcl/source/filter/igif/decode \
-    vcl/source/filter/igif/gifread \
-    vcl/source/filter/ixbm/xbmread \
-    vcl/source/filter/ixpm/xpmread \
-    vcl/source/filter/jpeg/Exif \
-    vcl/source/filter/jpeg/jpeg \
-    vcl/source/filter/jpeg/jpegc \
-    vcl/source/filter/jpeg/JpegReader \
-    vcl/source/filter/jpeg/JpegWriter \
-    vcl/source/filter/jpeg/JpegTransform \
-    vcl/source/filter/wmf/emfwr \
-    vcl/source/filter/wmf/enhwmf \
-    vcl/source/filter/wmf/winmtf \
-    vcl/source/filter/wmf/winwmf \
-    vcl/source/filter/wmf/wmf \
-    vcl/source/filter/wmf/wmfwr \
-    vcl/source/font/PhysicalFontCollection \
-    vcl/source/font/PhysicalFontFace \
-    vcl/source/font/PhysicalFontFamily \
-    vcl/source/fontsubset/cff \
-    vcl/source/fontsubset/fontsubset \
-    vcl/source/fontsubset/gsub \
-    vcl/source/fontsubset/list \
-    vcl/source/fontsubset/sft \
-    vcl/source/fontsubset/ttcr \
-    vcl/source/fontsubset/xlat \
+    vcl/source/outdev/outdev \
+    vcl/source/outdev/outdevstate \
+    vcl/source/outdev/clipping \
+    vcl/source/outdev/polygon \
+    vcl/source/outdev/transparent \
+    vcl/source/outdev/mask \
+    vcl/source/outdev/bitmap \
+    vcl/source/outdev/font \
+    vcl/source/outdev/text \
+    vcl/source/outdev/textline \
+    vcl/source/outdev/pixel \
+    vcl/source/outdev/rect \
+    vcl/source/outdev/line \
+    vcl/source/outdev/polyline \
+    vcl/source/outdev/hatch \
+    vcl/source/outdev/gradient \
+    vcl/source/outdev/curvedshapes \
+    vcl/source/outdev/wallpaper \
+    vcl/source/outdev/nativecontrols \
+    vcl/source/outdev/map \
     vcl/source/gdi/alpha \
     vcl/source/gdi/animate \
     vcl/source/gdi/base14 \
@@ -234,26 +162,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/gdi/metric \
     vcl/source/gdi/octree \
     vcl/source/gdi/oldprintadaptor \
-    vcl/source/outdev/outdev \
-    vcl/source/outdev/outdevstate \
-    vcl/source/outdev/clipping \
-    vcl/source/outdev/polygon \
-    vcl/source/outdev/transparent \
-    vcl/source/outdev/mask \
-    vcl/source/outdev/bitmap \
-    vcl/source/outdev/font \
-    vcl/source/outdev/text \
-    vcl/source/outdev/textline \
-    vcl/source/outdev/pixel \
-    vcl/source/outdev/rect \
-    vcl/source/outdev/line \
-    vcl/source/outdev/polyline \
-    vcl/source/outdev/hatch \
-    vcl/source/outdev/gradient \
-    vcl/source/outdev/curvedshapes \
-    vcl/source/outdev/wallpaper \
-    vcl/source/outdev/nativecontrols \
-    vcl/source/outdev/map \
     vcl/source/gdi/pdfextoutdevdata \
     vcl/source/gdi/pdffontcache \
     vcl/source/gdi/pdfwriter \
@@ -275,13 +183,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/gdi/textlayout \
     vcl/source/gdi/virdev \
     vcl/source/gdi/wall \
-    vcl/source/helper/canvasbitmap \
-    vcl/source/helper/canvastools \
-    vcl/source/helper/evntpost \
-    vcl/source/helper/lazydelete \
-    vcl/source/helper/strhelper \
-    vcl/source/helper/threadex \
-    vcl/source/helper/xconnection \
     vcl/source/window/abstdlg \
     vcl/source/window/accel \
     vcl/source/window/accmgr \
@@ -327,6 +228,105 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/window/window \
     vcl/source/window/winproc \
     vcl/source/window/wrkwin \
+    vcl/source/control/button \
+    vcl/source/control/combobox \
+    vcl/source/control/ctrl \
+    vcl/source/control/edit \
+    vcl/source/control/field2 \
+    vcl/source/control/field \
+    vcl/source/control/fixed \
+    vcl/source/control/fixedhyper \
+    vcl/source/control/group \
+    vcl/source/control/ilstbox \
+    vcl/source/control/imgctrl \
+    vcl/source/control/longcurr \
+    vcl/source/control/lstbox \
+    vcl/source/control/menubtn \
+    vcl/source/control/morebtn \
+    vcl/source/control/quickselectionengine \
+    vcl/source/control/prgsbar \
+    vcl/source/control/scrbar \
+    vcl/source/control/slider \
+    vcl/source/control/spinbtn \
+    vcl/source/control/spinfld \
+    vcl/source/control/tabctrl \
+    vcl/source/control/throbber \
+    vcl/source/edit/vclmedit \
+    vcl/source/edit/textdata \
+    vcl/source/edit/textdoc \
+    vcl/source/edit/texteng \
+    vcl/source/edit/textundo \
+    vcl/source/edit/textview \
+    vcl/source/edit/txtattr \
+    vcl/source/edit/xtextedt \
+    vcl/source/helper/canvasbitmap \
+    vcl/source/helper/canvastools \
+    vcl/source/helper/evntpost \
+    vcl/source/helper/lazydelete \
+    vcl/source/helper/strhelper \
+    vcl/source/helper/threadex \
+    vcl/source/helper/xconnection \
+    vcl/source/app/brand \
+    vcl/source/app/dbggui \
+    vcl/source/app/dndhelp \
+    vcl/source/app/help \
+    vcl/source/app/i18nhelp \
+    vcl/source/app/idlemgr \
+    vcl/source/app/salvtables \
+    vcl/source/app/session \
+    vcl/source/app/settings \
+    vcl/source/app/IconThemeInfo \
+    vcl/source/app/IconThemeScanner \
+    vcl/source/app/IconThemeSelector \
+    vcl/source/app/sound \
+    vcl/source/app/stdtext \
+    vcl/source/app/svapp \
+    vcl/source/app/svdata \
+    vcl/source/app/svmain \
+    vcl/source/app/svmainhook \
+    vcl/source/app/timer \
+    vcl/source/app/unohelp2 \
+    vcl/source/app/unohelp \
+    vcl/source/app/vclevent \
+    vcl/source/components/dtranscomp \
+    vcl/source/components/factory \
+    vcl/source/components/fontident \
+    vcl/source/filter/FilterConfigCache \
+    vcl/source/filter/FilterConfigItem \
+    vcl/source/filter/graphicfilter \
+    vcl/source/filter/graphicfilter2 \
+    vcl/source/filter/GraphicNativeTransform \
+    vcl/source/filter/GraphicNativeMetadata \
+    vcl/source/filter/sgfbram \
+    vcl/source/filter/sgvmain \
+    vcl/source/filter/sgvspln \
+    vcl/source/filter/sgvtext \
+    vcl/source/filter/igif/decode \
+    vcl/source/filter/igif/gifread \
+    vcl/source/filter/ixbm/xbmread \
+    vcl/source/filter/ixpm/xpmread \
+    vcl/source/filter/jpeg/Exif \
+    vcl/source/filter/jpeg/jpeg \
+    vcl/source/filter/jpeg/jpegc \
+    vcl/source/filter/jpeg/JpegReader \
+    vcl/source/filter/jpeg/JpegWriter \
+    vcl/source/filter/jpeg/JpegTransform \
+    vcl/source/filter/wmf/emfwr \
+    vcl/source/filter/wmf/enhwmf \
+    vcl/source/filter/wmf/winmtf \
+    vcl/source/filter/wmf/winwmf \
+    vcl/source/filter/wmf/wmf \
+    vcl/source/filter/wmf/wmfwr \
+    vcl/source/font/PhysicalFontCollection \
+    vcl/source/font/PhysicalFontFace \
+    vcl/source/font/PhysicalFontFamily \
+    vcl/source/fontsubset/cff \
+    vcl/source/fontsubset/fontsubset \
+    vcl/source/fontsubset/gsub \
+    vcl/source/fontsubset/list \
+    vcl/source/fontsubset/sft \
+    vcl/source/fontsubset/ttcr \
+    vcl/source/fontsubset/xlat \
 ))
 
 $(eval $(call gb_Library_add_cobjects,vcl,\