[Libreoffice-commits] .: 3 commits - cppuhelper/inc sal/inc svx/inc svx/source sw/source unusedcode.easy vcl/aqua vcl/headless vcl/inc vcl/source vcl/unx vcl/win

Thomas Arnhold tarnhold at kemper.freedesktop.org
Tue Feb 21 15:52:42 PST 2012


 cppuhelper/inc/cppuhelper/propshlp.hxx       |    6 +-
 cppuhelper/inc/cppuhelper/unourl.hxx         |    4 -
 sal/inc/osl/pipe_decl.hxx                    |    2 
 sal/inc/osl/security_decl.hxx                |    2 
 sal/inc/osl/semaphor.hxx                     |    2 
 sal/inc/osl/socket_decl.hxx                  |    6 +-
 sal/inc/rtl/strbuf.hxx                       |   18 +++---
 sal/inc/rtl/string.hxx                       |    2 
 sal/inc/rtl/ustring.hxx                      |    2 
 svx/inc/svx/insctrl.hxx                      |    2 
 svx/inc/svx/ruler.hxx                        |    1 
 svx/inc/svx/selctrl.hxx                      |    2 
 svx/inc/svx/xmlsecctrl.hxx                   |    1 
 svx/source/dialog/svxruler.cxx               |   12 ----
 svx/source/stbctrls/insctrl.cxx              |   12 ----
 svx/source/stbctrls/selctrl.cxx              |   20 -------
 svx/source/stbctrls/xmlsecctrl.cxx           |    5 -
 sw/source/core/text/txtfly.cxx               |   77 ---------------------------
 sw/source/core/text/txtfly.hxx               |    8 --
 unusedcode.easy                              |    7 --
 vcl/aqua/source/gdi/salnativewidgets.cxx     |   18 ------
 vcl/headless/svpinst.cxx                     |   23 --------
 vcl/inc/aqua/salgdi.h                        |    3 -
 vcl/inc/headless/svpinst.hxx                 |    1 
 vcl/inc/ios/salgdi.h                         |    3 -
 vcl/inc/salgdi.hxx                           |   12 ----
 vcl/inc/unx/gtk/gtkgdi.hxx                   |    3 -
 vcl/inc/win/salgdi.h                         |    3 -
 vcl/source/gdi/salgdilayout.cxx              |   17 -----
 vcl/source/gdi/salnativewidgets-none.cxx     |   22 -------
 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx     |   21 -------
 vcl/unx/kde/salnativewidgets-kde.cxx         |   27 ---------
 vcl/unx/kde4/KDESalGraphics.hxx              |   12 ----
 vcl/win/source/gdi/salnativewidgets-luna.cxx |   22 -------
 34 files changed, 22 insertions(+), 356 deletions(-)

New commits:
commit 22e96521da9614c07b75452dc27014aca079fbf1
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Wed Feb 22 00:50:56 2012 +0100

    WaE: silence some documentation errors

diff --git a/cppuhelper/inc/cppuhelper/propshlp.hxx b/cppuhelper/inc/cppuhelper/propshlp.hxx
index 4b01126..1ed2f60 100644
--- a/cppuhelper/inc/cppuhelper/propshlp.hxx
+++ b/cppuhelper/inc/cppuhelper/propshlp.hxx
@@ -78,7 +78,7 @@ public:
                           is getCount() -1, than it must be an indexed acces to the property array.
        @param pPropName is an out parameter filled with property name of the property with the
                               handle nHandle. May be NULL.
-       @param rAttributes is an out parameter filled with attributes of the property with the
+       @param pAttributes is an out parameter filled with attributes of the property with the
                               handle nHandle. May be NULL.
        @return True, if the handle exist, otherwise false.
      */
@@ -160,7 +160,7 @@ public:
                           Otherwise it is a linear search through the array.
        @param pPropName is an out parameter filled with property name of the property with the
                               handle nHandle. May be NULL.
-       @param rAttributes is an out parameter filled with attributes of the property with the
+       @param pAttributes is an out parameter filled with attributes of the property with the
                               handle nHandle. May be NULL.
        @return True, if the handle exist, otherwise false.
      */
@@ -274,7 +274,7 @@ public:
     /**
       Insert an element in the container specified with the key. The position is not specified.
       @param rKey       the id of the container.
-      @param rxIFace    the added interface. It is allowed to insert null or
+      @param r          the added interface. It is allowed to insert null or
                          the same pointer more than once.
       @return the new count of elements in the container.
      */
diff --git a/cppuhelper/inc/cppuhelper/unourl.hxx b/cppuhelper/inc/cppuhelper/unourl.hxx
index 37801e3..3e3a615 100644
--- a/cppuhelper/inc/cppuhelper/unourl.hxx
+++ b/cppuhelper/inc/cppuhelper/unourl.hxx
@@ -88,7 +88,7 @@ public:
     /** Test whether the parameters contain a key.
 
         @param
-        A (case insensitive) key.
+        rKey A (case insensitive) key.
 
         @return
         True if the parameters contain a matching key/value pair.
@@ -98,7 +98,7 @@ public:
     /** Return the parameter value for a key.
 
         @param
-        A (case insensitive) key.
+        rKey A (case insensitive) key.
 
         @return
         The (case sensitive) value associated with the given key, or an empty
diff --git a/sal/inc/osl/pipe_decl.hxx b/sal/inc/osl/pipe_decl.hxx
index b361440..084a61b 100644
--- a/sal/inc/osl/pipe_decl.hxx
+++ b/sal/inc/osl/pipe_decl.hxx
@@ -185,7 +185,7 @@ public:
     /** Attaches the oslPipe to this object. If the object
         already was attached to an oslPipe, the old one will
         be closed and destroyed.
-        @param Pipe.
+        @param Pipe
     */
     inline StreamPipe & SAL_CALL operator=(oslPipe Pipe);
 
diff --git a/sal/inc/osl/security_decl.hxx b/sal/inc/osl/security_decl.hxx
index d0a0cbc..e9879d0 100644
--- a/sal/inc/osl/security_decl.hxx
+++ b/sal/inc/osl/security_decl.hxx
@@ -74,7 +74,7 @@ public:
                                        const rtl::OUString & strFileServer);
 
     /** get the ident of the logged in user.
-        @param[out] strName is the OUString which returns the name
+        @param[out] strIdent is the OUString which returns the name
         @return True, if any user is successfuly logged in, otherwise False
     */
     inline sal_Bool  SAL_CALL getUserIdent( rtl::OUString& strIdent) const;
diff --git a/sal/inc/osl/semaphor.hxx b/sal/inc/osl/semaphor.hxx
index a36db2a..7fcbd55 100644
--- a/sal/inc/osl/semaphor.hxx
+++ b/sal/inc/osl/semaphor.hxx
@@ -46,7 +46,7 @@ namespace osl
     public:
 
         /** Creates a semaphore.<BR>
-            @param InitialCount denotes the starting value the semaphore. If you set it to
+            @param initialCount denotes the starting value the semaphore. If you set it to
             zero, the first acquire() blocks. Otherwise InitialCount acquire()s  are
             immedeatly  successfull.
             @return 0 if the semaphore could not be created, otherwise a handle to the sem.
diff --git a/sal/inc/osl/socket_decl.hxx b/sal/inc/osl/socket_decl.hxx
index 0c26f25..731c7a2 100644
--- a/sal/inc/osl/socket_decl.hxx
+++ b/sal/inc/osl/socket_decl.hxx
@@ -142,7 +142,7 @@ namespace osl
         inline oslSocketAddr SAL_CALL getHandle() const;
 
         /** Get the hostname for the local interface.
-            @param after the call *pResult contains osl_Socket_Ok on success or
+            @param pResult after the call *pResult contains osl_Socket_Ok on success or
                    an error on failure.
             @return the hostname
         */
@@ -440,7 +440,7 @@ namespace osl
 
             @param pBuffer Pointer to a Buffer which contains the attribute-value.
 
-            @param BufferSize contains the length of the Buffer.
+            @param BufferLen contains the length of the Buffer.
 
             @param Level selects the level for which an option should be changed.
             Valid values are:
@@ -600,7 +600,7 @@ namespace osl
 
         /** Connects the socket to a (remote) host.
             @param TargetHost The address of the target.
-            @param pTimeOut The timeout for blocking. If 0, a default system dependent timeout
+            @param pTimeout The timeout for blocking. If 0, a default system dependent timeout
                             us used.
             @return <code> osl_Socket_Ok</code> if connected successfully,
             <code>osl_Socket_TimedOut</code> on timeout,
diff --git a/sal/inc/rtl/strbuf.hxx b/sal/inc/rtl/strbuf.hxx
index 4df6e3b..a92ea1d 100644
--- a/sal/inc/rtl/strbuf.hxx
+++ b/sal/inc/rtl/strbuf.hxx
@@ -404,7 +404,7 @@ public:
         The argument is appended to the contents of this string buffer.
         The length of this string buffer increases by <code>1</code>.
 
-        @param   ch   a <code>char</code>.
+        @param   c   a <code>char</code>.
         @return  this string buffer.
      */
     OStringBuffer & append(sal_Char c)
@@ -514,7 +514,7 @@ public:
         string buffer.
 
         @param      offset   the offset.
-        @param      ch       a character array.
+        @param      str      a character array.
         @return     this string buffer.
      */
     OStringBuffer & insert( sal_Int32 offset, const sal_Char * str )
@@ -536,8 +536,8 @@ public:
         string buffer.
 
         @param      offset   the offset.
-        @param      ch       a character array.
-        @param       len     the number of characters to append.
+        @param      str      a character array.
+        @param      len      the number of characters to append.
         @return     this string buffer.
      */
     OStringBuffer & insert( sal_Int32 offset, const sal_Char * str, sal_Int32 len)
@@ -583,7 +583,7 @@ public:
         string buffer.
 
         @param      offset   the offset.
-        @param      ch       a <code>char</code>.
+        @param      c        a <code>char</code>.
         @return     this string buffer.
      */
     OStringBuffer & insert(sal_Int32 offset, sal_Char c)
@@ -605,7 +605,7 @@ public:
         string buffer.
 
         @param      offset   the offset.
-        @param      b        an <code>sal_Int32</code>.
+        @param      i        an <code>sal_Int32</code>.
         @return     this string buffer.
      */
     OStringBuffer & insert(sal_Int32 offset, sal_Int32 i, sal_Int16 radix = 10 )
@@ -628,7 +628,7 @@ public:
         string buffer.
 
         @param      offset   the offset.
-        @param      b        a <code>long</code>.
+        @param      l        a <code>long</code>.
         @return     this string buffer.
      */
     OStringBuffer & insert(sal_Int32 offset, sal_Int64 l, sal_Int16 radix = 10 )
@@ -651,7 +651,7 @@ public:
         string buffer.
 
         @param      offset   the offset.
-        @param      b        a <code>float</code>.
+        @param      f        a <code>float</code>.
         @return     this string buffer.
      */
     OStringBuffer insert(sal_Int32 offset, float f)
@@ -674,7 +674,7 @@ public:
         string buffer.
 
         @param      offset   the offset.
-        @param      b        a <code>double</code>.
+        @param      d        a <code>double</code>.
         @return     this string buffer.
      */
     OStringBuffer & insert(sal_Int32 offset, double d)
diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx
index 0809c26..e879f32 100644
--- a/sal/inc/rtl/string.hxx
+++ b/sal/inc/rtl/string.hxx
@@ -299,7 +299,7 @@ public:
       the strings and return a value indicating their relationship.
       This function can't be used for language specific sorting.
 
-      @param    str         the object to be compared.
+      @param    rObj        the object to be compared.
       @param    maxLength   the maximum count of characters to be compared.
       @return   0 - if both strings are equal
                 < 0 - if this string is less than the string argument
diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx
index 2318243..faff676 100644
--- a/sal/inc/rtl/ustring.hxx
+++ b/sal/inc/rtl/ustring.hxx
@@ -1786,7 +1786,7 @@ inline OUString OStringToOUString( const OString & rStr,
     The lengths of the two strings may differ (e.g., for double-byte
     encodings, UTF-7, UTF-8).
 
-    @param rStr
+    @param rUnicode
     an OUString to convert.
 
     @param encoding
commit ef026f335902a278f8594d612826508277d81bff
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Wed Feb 22 00:10:04 2012 +0100

    unusedcode.easy: remove some more

diff --git a/svx/inc/svx/insctrl.hxx b/svx/inc/svx/insctrl.hxx
index 45fef75..0f94a0e 100644
--- a/svx/inc/svx/insctrl.hxx
+++ b/svx/inc/svx/insctrl.hxx
@@ -48,8 +48,6 @@ public:
     SvxInsertStatusBarControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb );
     ~SvxInsertStatusBarControl();
 
-    static  sal_uIntPtr GetDefItemWidth(const StatusBar& rStb);
-
 private:
     sal_Bool    bInsert;
 
diff --git a/svx/inc/svx/ruler.hxx b/svx/inc/svx/ruler.hxx
index e1a17dc..d563afb 100644
--- a/svx/inc/svx/ruler.hxx
+++ b/svx/inc/svx/ruler.hxx
@@ -248,7 +248,6 @@ public:
     sal_uInt16 GetRulerFlags() const { return nFlags; }
 
     void SetDefTabDist(long);
-    long GetDefTabDist() const;
 
     // set/get NullOffset in logic units
     void SetNullOffsetLogic(long lOff = 0);
diff --git a/svx/inc/svx/selctrl.hxx b/svx/inc/svx/selctrl.hxx
index 7ba8e19..42b30db 100644
--- a/svx/inc/svx/selctrl.hxx
+++ b/svx/inc/svx/selctrl.hxx
@@ -47,8 +47,6 @@ public:
 
     SvxSelectionModeControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb );
 
-    static  sal_uIntPtr GetDefItemWidth(const StatusBar& rStb);
-
 private:
     sal_uInt16  nState;
 
diff --git a/svx/inc/svx/xmlsecctrl.hxx b/svx/inc/svx/xmlsecctrl.hxx
index df6d9f7..7de654c 100644
--- a/svx/inc/svx/xmlsecctrl.hxx
+++ b/svx/inc/svx/xmlsecctrl.hxx
@@ -53,7 +53,6 @@ public:
     virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
     virtual void    Paint( const UserDrawEvent& rEvt );
     virtual void    Command( const CommandEvent& rCEvt );
-    static long     GetDefItemWidth( StatusBar& _rStatusBar );
 };
 
 #endif
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index ad28264..e355f4c 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -1102,18 +1102,6 @@ void SvxRuler::SetDefTabDist
 }
 
 
-long SvxRuler::GetDefTabDist() const
-
-/* [Description]
-
-   Get value for DefaultTab (is delivered in App-metrics)
-*/
-
-{
-    return lDefTabDist;
-}
-
-
 sal_uInt16 ToSvTab_Impl(SvxTabAdjust eAdj)
 
 /* [Description]
diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx
index 0641de7..8d4ad19 100644
--- a/svx/source/stbctrls/insctrl.cxx
+++ b/svx/source/stbctrls/insctrl.cxx
@@ -114,16 +114,4 @@ void SvxInsertStatusBarControl::DrawItemText_Impl()
     GetStatusBar().SetItemText( GetId(), SVX_RESSTR( _nId ) );
 }
 
-sal_uIntPtr SvxInsertStatusBarControl::GetDefItemWidth(const StatusBar& rStb)
-{
-    long nWidth1 =  rStb.GetTextWidth(SVX_RESSTR(RID_SVXSTR_OVERWRITE_TEXT));
-    long nWidth2 =  rStb.GetTextWidth(SVX_RESSTR(RID_SVXSTR_INSERT_TEXT));
-
-    if(nWidth1<nWidth2)
-        nWidth1=nWidth2;
-
-    return nWidth1+PAINT_OFFSET;
-}
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx
index c929d9d..d0561d8 100644
--- a/svx/source/stbctrls/selctrl.cxx
+++ b/svx/source/stbctrls/selctrl.cxx
@@ -129,24 +129,4 @@ void SvxSelectionModeControl::DrawItemText_Impl()
     GetStatusBar().SetItemText( GetId(), sTxt );
 }
 
-sal_uIntPtr SvxSelectionModeControl::GetDefItemWidth(const StatusBar& rStb)
-{
-    long nWidth1 =  rStb.GetTextWidth(SVX_RESSTR(RID_SVXSTR_SELMODE_STD));
-    long nWidth2 =  rStb.GetTextWidth(SVX_RESSTR(RID_SVXSTR_SELMODE_ER));
-    long nWidth3 =  rStb.GetTextWidth(SVX_RESSTR(RID_SVXSTR_SELMODE_ERG));
-    long nWidth4 =  rStb.GetTextWidth(SVX_RESSTR(RID_SVXSTR_SELMODE_BLK));
-
-    if(nWidth1<nWidth2)
-        nWidth1=nWidth2;
-
-    if(nWidth1<nWidth3)
-        nWidth1=nWidth3;
-
-    if(nWidth1<nWidth4)
-        nWidth1=nWidth4;
-
-    return nWidth1+PAINT_OFFSET;
-}
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx
index abe08b6..619f178 100644
--- a/svx/source/stbctrls/xmlsecctrl.cxx
+++ b/svx/source/stbctrls/xmlsecctrl.cxx
@@ -170,9 +170,4 @@ void XmlSecStatusBarControl::Paint( const UserDrawEvent& rUsrEvt )
     pDev->SetFillColor( aOldFillColor );
 }
 
-long XmlSecStatusBarControl::GetDefItemWidth( StatusBar& )
-{
-    return 16;
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index c2695f9..0fc70b8 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -1734,83 +1734,6 @@ const SwRect SwContourCache::ContourRect( const SwFmt* pFmt,
 }
 
 /*************************************************************************
- *                      SwContourCache::ShowContour()
- * zeichnet die PolyPolygone des Caches zu Debugzwecken.
- *************************************************************************/
-#ifdef DBG_UTIL
-void SwContourCache::ShowContour( OutputDevice* pOut, const SdrObject* pObj,
-    const Color& rClosedColor, const Color& rOpenColor )
-{
-    MSHORT nPos = 0; // Suche im Cache ...
-    while( nPos < POLY_CNT && pObj != pSdrObj[ nPos ] )
-        ++nPos;
-    if( POLY_CNT != nPos )
-    {
-        const PolyPolygon* pPol = pTextRanger[ nPos ]->GetLinePolygon();
-        if( !pPol )
-            pPol = &(pTextRanger[ nPos ]->GetPolyPolygon());
-        for( MSHORT i = 0; i < pPol->Count(); ++i )
-        {
-            pOut->SetLineColor( rOpenColor );
-            const Polygon& rPol = (*pPol)[ i ];
-            MSHORT nCount = rPol.GetSize();
-            if( nCount > 1 && rPol[ 0 ] == rPol[ nCount - 1 ] )
-                pOut->SetLineColor( rClosedColor );
-            pOut->DrawPolygon( rPol );
-        }
-        static KSHORT nRadius = 0;
-        if( nRadius )
-        {
-            KSHORT nHalf = nRadius / 2;
-            Size aSz( nRadius, nRadius );
-            for( MSHORT i = 0; i < pPol->Count(); ++i )
-            {
-                const Polygon& rPol = (*pPol)[ i ];
-                MSHORT nCount = rPol.GetSize();
-                for( MSHORT k = 0; k < nCount; ++k )
-                {
-                    Point aPt( rPol[ k ] );
-                    aPt.X() -= nHalf;
-                    aPt.Y() -= nHalf;
-                    Rectangle aTmp( aPt, aSz );
-                    pOut->DrawEllipse( aTmp );
-                }
-            }
-        }
-    }
-}
-#endif
-
-/*************************************************************************
- *                      SwTxtFly::ShowContour()
- * zeichnet die PolyPolygone des Caches zu Debugzwecken.
- *************************************************************************/
-#ifdef DBG_UTIL
-void SwTxtFly::ShowContour( OutputDevice* pOut )
-{
-    MSHORT nFlyCount;
-    if( bOn && ( 0 != ( nFlyCount = static_cast<sal_uInt16>(GetAnchoredObjList()->size() ) ) ) )
-    {
-        Color aRedColor( COL_LIGHTRED );
-        Color aGreenColor( COL_LIGHTGREEN );
-        Color aSaveColor( pOut->GetLineColor() );
-        for( MSHORT j = 0; j < nFlyCount; ++j )
-        {
-            const SwAnchoredObject* pObj = (*mpAnchoredObjList)[ j ];
-            if( !pObj->GetFrmFmt().GetSurround().IsContour() )
-            {
-                Rectangle aRect = pObj->GetObjRectWithSpaces().SVRect();
-                pOut->DrawRect( aRect );
-                continue;
-            }
-            pContourCache->ShowContour( pOut, pObj->GetDrawObj(), aRedColor, aGreenColor );
-        }
-        pOut->SetLineColor( aSaveColor );
-    }
-}
-#endif
-
-/*************************************************************************
  *                      SwTxtFly::ForEach()
  *
  * sucht nach dem ersten Objekt, welches mit dem Rechteck ueberlappt
diff --git a/sw/source/core/text/txtfly.hxx b/sw/source/core/text/txtfly.hxx
index 9b559bc..336b3dc 100644
--- a/sw/source/core/text/txtfly.hxx
+++ b/sw/source/core/text/txtfly.hxx
@@ -89,10 +89,6 @@ public:
                                        const SwTxtFrm* pFrm,
                                        const long nXPos,
                                        const sal_Bool bRight );
-#ifdef DBG_UTIL
-    void ShowContour( OutputDevice* pOut, const SdrObject* pObj,
-                      const Color& rClosedColor, const Color& rOpenColor );
-#endif
 };
 
 /*************************************************************************
@@ -189,10 +185,6 @@ public:
     {
         mbIgnoreObjsInHeaderFooter = _bNew;
     }
-
-#ifdef DBG_UTIL
-    void ShowContour( OutputDevice* pOut );
-#endif
 };
 
 // Wenn in das rRect (meist die aktuelle Zeile) kein freifliegender
diff --git a/unusedcode.easy b/unusedcode.easy
index 5dafe65..758f612 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -228,7 +228,6 @@ SvXMLTokenMap_Impl::Insert(SvXMLTokenMapEntry_Impl* const*, unsigned short)
 SvXMLTokenMap_Impl::Insert(SvXMLTokenMap_Impl const*, unsigned short, unsigned short)
 SvXMLTokenMap_Impl::Remove(SvXMLTokenMapEntry_Impl* const&, unsigned short)
 SvXMLTokenMap_Impl::Remove(unsigned short, unsigned short)
-SvpSalInstance::CancelEvent(SalFrame const*, void*, unsigned short)
 SvtBroadcaster::Forward(SvtBroadcaster&, SfxHint const&)
 SvtIconChoiceCtrl::SvtIconChoiceCtrl(Window*, ResId const&)
 SvtIconWindow_Impl::GetSelectedIconText() const
@@ -261,7 +260,6 @@ SvxDrawPage::SvxDrawPage()
 SvxEditSourceHelper::UserSpaceToEE(Rectangle const&, Size const&, bool)
 SvxFrameDirectionItem::SvxFrameDirectionItem(unsigned short)
 SvxIMapDlg::GetTargetList() const
-SvxInsertStatusBarControl::GetDefItemWidth(StatusBar const&)
 SvxJustifyMethodItem::SvxJustifyMethodItem(unsigned short)
 SvxLanguageBox::SvxLanguageBox(Window*, long, unsigned char)
 SvxMSDffManager::GetAutoForm(MSO_SPT) const
@@ -284,8 +282,6 @@ SvxPopupWindowListBox::StartSelection()
 SvxRectCtlAccessibleContext::CommitChange(com::sun::star::accessibility::AccessibleEventObject const&)
 SvxRelativeField::SvxRelativeField(Window*, long)
 SvxRubyChildWindow::GetChildWindowId()
-SvxRuler::GetDefTabDist() const
-SvxSelectionModeControl::GetDefItemWidth(StatusBar const&)
 SvxShapeText::SvxShapeText()
 SvxTabStopArr::Insert(SvxTabStop const&, unsigned short&)
 SvxTabStopArr::Insert(SvxTabStop const*, unsigned short)
@@ -391,7 +387,6 @@ SwTabFrm::GetLeaf(MakePageType, unsigned char)
 SwTableSortBoxes::DeleteAndDestroy(unsigned short, unsigned short)
 SwTableSortBoxes::Insert(SwTableBox* const&, unsigned short&)
 SwTableSortBoxes::Insert(SwTableBox* const*, unsigned short)
-SwTxtFly::ShowContour(OutputDevice*)
 SwWriteTableCols::Insert(SwWriteTableCol* const&, unsigned short&)
 SwWriteTableCols::Insert(SwWriteTableCol* const*, unsigned short)
 SwWriteTableCols::Insert(SwWriteTableCols const*, unsigned short, unsigned short)
@@ -531,7 +526,6 @@ XclExpString::SetFormats(std::__debug::vector<XclFormatRun, std::allocator<XclFo
 XclTokenArray::XclTokenArray(std::__debug::vector<unsigned char, std::allocator<unsigned char> >&, bool)
 XclTokenArrayIterator::Init()
 XclXFBase::HasUsedFlags() const
-XmlSecStatusBarControl::GetDefItemWidth(StatusBar&)
 ZipPackageStream::SetBaseEncryptionData(rtl::Reference<BaseEncryptionData> const&)
 _CpyTabFrms::Insert(_CpyTabFrm const&, unsigned short&)
 _CpyTabFrms::Insert(_CpyTabFrm const*, unsigned short)
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index e330dcb..91bbff3 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -126,29 +126,6 @@ void SvpSalInstance::PostEvent( const SalFrame* pFrame, void* pData, sal_uInt16
     Wakeup();
 }
 
-void SvpSalInstance::CancelEvent( const SalFrame* pFrame, void* pData, sal_uInt16 nEvent )
-{
-    if( osl_acquireMutex( m_aEventGuard ) )
-    {
-        if( ! m_aUserEvents.empty() )
-        {
-            std::list< SalUserEvent >::iterator it = m_aUserEvents.begin();
-            do
-            {
-                if( it->m_pFrame    == pFrame   &&
-                    it->m_pData     == pData    &&
-                    it->m_nEvent    == nEvent )
-                {
-                    it = m_aUserEvents.erase( it );
-                }
-                else
-                    ++it;
-            } while( it != m_aUserEvents.end() );
-        }
-        osl_releaseMutex( m_aEventGuard );
-    }
-}
-
 void SvpSalInstance::deregisterFrame( SalFrame* pFrame )
 {
     m_aFrames.remove( pFrame );
diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx
index 92b989f..f20f7cd 100644
--- a/vcl/inc/headless/svpinst.hxx
+++ b/vcl/inc/headless/svpinst.hxx
@@ -105,7 +105,6 @@ public:
     virtual ~SvpSalInstance();
 
     void PostEvent( const SalFrame* pFrame, void* pData, sal_uInt16 nEvent );
-    void CancelEvent( const SalFrame* pFrame, void* pData, sal_uInt16 nEvent );
 
     void StartTimer( sal_uLong nMS );
     void StopTimer();
commit 178ce4295ba864b4dd5082eff7e3444d5cead6ca
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Tue Feb 21 23:45:01 2012 +0100

    unusedcode.easy: vcl: remove DrawNativeControlText()

diff --git a/unusedcode.easy b/unusedcode.easy
index 4e27d2e..5dafe65 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -49,7 +49,6 @@ ParagraphStyleManager::get(WPXString const&) const
 PopupMenu::SetSelectedEntry(unsigned short)
 PropBrwMgr::GetChildWindowId()
 SalGraphics::DrawBitmap(SalTwoRect const*, SalBitmap const&, unsigned int, OutputDevice const*)
-SalGraphics::DrawNativeControlText(unsigned int, unsigned int, Rectangle const&, unsigned int, ImplControlValue const&, rtl::OUString const&, OutputDevice const*)
 SalGraphics::drawAlphaBitmap(SalTwoRect const&, SalBitmap const&, SalBitmap const&)
 SalGraphics::drawPolyLine(basegfx::B2DPolygon const&, double, basegfx::B2DVector const&, basegfx::B2DLineJoin)
 SalGraphics::drawPolyPolygon(basegfx::B2DPolyPolygon const&, double)
diff --git a/vcl/aqua/source/gdi/salnativewidgets.cxx b/vcl/aqua/source/gdi/salnativewidgets.cxx
index 1b3798e..a2f6298 100644
--- a/vcl/aqua/source/gdi/salnativewidgets.cxx
+++ b/vcl/aqua/source/gdi/salnativewidgets.cxx
@@ -1216,24 +1216,6 @@ sal_Bool AquaSalGraphics::drawNativeControl(ControlType nType,
 }
 
 /*
- * DrawNativeControlText()
- *
- *  OPTIONAL.  Draws the requested text for the control described by nPart/nState.
- *     Used if text not drawn by DrawNativeControl().
- *
- *  rControlRegion: The bounding region of the complete control in VCL frame coordinates.
- *  aValue:     An optional value (tristate/numerical/string)
- *  aCaption:   A caption or title string (like button text etc)
- */
-sal_Bool AquaSalGraphics::drawNativeControlText( ControlType /*nType*/, ControlPart /*nPart*/, const Rectangle& /*rControlRegion*/,
-                                               ControlState /*nState*/, const ImplControlValue& /*aValue*/,
-                                               const rtl::OUString& )
-{
-    return( sal_False );
-}
-
-
-/*
  * GetNativeControlRegion()
  *
  *  If the return value is sal_True, rNativeBoundingRegion
diff --git a/vcl/inc/aqua/salgdi.h b/vcl/inc/aqua/salgdi.h
index 2f2af4f..50c4ca1 100644
--- a/vcl/inc/aqua/salgdi.h
+++ b/vcl/inc/aqua/salgdi.h
@@ -238,9 +238,6 @@ public:
     virtual sal_Bool        drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
                                            ControlState nState, const ImplControlValue& aValue,
                                            const rtl::OUString& aCaption );
-    virtual sal_Bool        drawNativeControlText( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
-                                               ControlState nState, const ImplControlValue& aValue,
-                                               const rtl::OUString& aCaption );
     virtual sal_Bool        getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
                                                 const ImplControlValue& aValue, const rtl::OUString& aCaption,
                                                 Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion );
diff --git a/vcl/inc/ios/salgdi.h b/vcl/inc/ios/salgdi.h
index 5773f3e..92cf620 100644
--- a/vcl/inc/ios/salgdi.h
+++ b/vcl/inc/ios/salgdi.h
@@ -235,9 +235,6 @@ public:
     virtual sal_Bool        drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
                                            ControlState nState, const ImplControlValue& aValue,
                                            const rtl::OUString& aCaption );
-    virtual sal_Bool        drawNativeControlText( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
-                                               ControlState nState, const ImplControlValue& aValue,
-                                               const rtl::OUString& aCaption );
     virtual sal_Bool        getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
                                                 const ImplControlValue& aValue, const rtl::OUString& aCaption,
                                                 Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion );
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index d29247b..e351ed3 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -166,9 +166,6 @@ protected:
     virtual sal_Bool        drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
                                            ControlState nState, const ImplControlValue& aValue,
                                            const rtl::OUString& aCaption );
-    virtual sal_Bool        drawNativeControlText( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
-                                               ControlState nState, const ImplControlValue& aValue,
-                                               const rtl::OUString& aCaption );
     virtual sal_Bool        getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
                                                 const ImplControlValue& aValue, const rtl::OUString& aCaption,
                                                 Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion );
@@ -453,15 +450,6 @@ public:
                                     const rtl::OUString& aCaption,
                                     const OutputDevice *pOutDev );
 
-    // Request rendering of a caption string for a control
-    sal_Bool DrawNativeControlText( ControlType nType,
-                                        ControlPart nPart,
-                                        const Rectangle& rControlRegion,
-                                        ControlState nState,
-                                        const ImplControlValue& aValue,
-                                        const rtl::OUString& aCaption,
-                                        const OutputDevice *pOutDev );
-
     // Query the native control's actual drawing region (including adornment)
     sal_Bool GetNativeControlRegion( ControlType nType,
                                          ControlPart nPart,
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index 9f5c4dd..bdc397e 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -142,9 +142,6 @@ public:
     virtual sal_Bool        drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
                                            ControlState nState, const ImplControlValue& aValue,
                                            const rtl::OUString& rCaption );
-    virtual sal_Bool        drawNativeControlText( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
-                                               ControlState nState, const ImplControlValue& aValue,
-                                               const rtl::OUString& rCaption );
     virtual sal_Bool        getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
                                                 const ImplControlValue& aValue, const rtl::OUString& rCaption,
                                                 Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion );
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index 079f0ef..974d16c 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -260,9 +260,6 @@ protected:
     virtual sal_Bool        drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
                                            ControlState nState, const ImplControlValue& aValue,
                                            const rtl::OUString& aCaption );
-    virtual sal_Bool        drawNativeControlText( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
-                                               ControlState nState, const ImplControlValue& aValue,
-                                               const rtl::OUString& aCaption );
     virtual sal_Bool        getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
                                                 const ImplControlValue& aValue, const rtl::OUString& aCaption,
                                                 Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion );
diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx
index e388380..2197905 100644
--- a/vcl/source/gdi/salgdilayout.cxx
+++ b/vcl/source/gdi/salgdilayout.cxx
@@ -744,23 +744,6 @@ sal_Bool SalGraphics::DrawNativeControl( ControlType nType, ControlPart nPart, c
         return drawNativeControl( nType, nPart, rControlRegion, nState, aValue, aCaption );
 }
 
-sal_Bool SalGraphics::DrawNativeControlText( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
-                                                ControlState nState, const ImplControlValue& aValue,
-                                                const OUString& aCaption, const OutputDevice *pOutDev )
-{
-    if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) )
-    {
-        Rectangle rgn( rControlRegion );
-        mirror( rgn, pOutDev );
-        boost::scoped_ptr< ImplControlValue > mirrorValue( aValue.clone());
-        mirror( *mirrorValue, pOutDev );
-        sal_Bool bRet = drawNativeControlText( nType, nPart, rgn, nState, *mirrorValue, aCaption );
-        return bRet;
-    }
-    else
-        return drawNativeControlText( nType, nPart, rControlRegion, nState, aValue, aCaption );
-}
-
 sal_Bool SalGraphics::GetNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
                                                 const ImplControlValue& aValue, const OUString& aCaption,
                                                 Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion, const OutputDevice *pOutDev )
diff --git a/vcl/source/gdi/salnativewidgets-none.cxx b/vcl/source/gdi/salnativewidgets-none.cxx
index 7f32fdf..c6d1101 100644
--- a/vcl/source/gdi/salnativewidgets-none.cxx
+++ b/vcl/source/gdi/salnativewidgets-none.cxx
@@ -84,28 +84,6 @@ sal_Bool SalGraphics::drawNativeControl(    ControlType,
     return( sal_False );
 }
 
-
-/*
- * DrawNativeControlText()
- *
- *  OPTIONAL.  Draws the requested text for the control described by nPart/nState.
- *     Used if text not drawn by DrawNativeControl().
- *
- *  rControlRegion: The bounding region of the complete control in VCL frame coordinates.
- *  aValue:         An optional value (tristate/numerical/string)
- *  aCaption:   A caption or title string (like button text etc)
- */
-sal_Bool SalGraphics::drawNativeControlText(    ControlType,
-                                ControlPart,
-                                const Rectangle&,
-                                ControlState,
-                                const ImplControlValue&,
-                                const OUString& )
-{
-    return( sal_False );
-}
-
-
 /*
  * GetNativeControlRegion()
  *
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index a55d3f4..9729915 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -904,27 +904,6 @@ sal_Bool GtkSalGraphics::drawNativeControl(    ControlType nType,
 }
 
 /*
- * DrawNativeControlText()
- *
- *  OPTIONAL.  Draws the requested text for the control described by nPart/nState.
- *     Used if text not drawn by DrawNativeControl().
- *
- *  rControlRegion:    The bounding region of the complete control in VCL frame coordinates.
- *  aValue:          An optional value (tristate/numerical/string)
- *  rCaption:      A caption or title string (like button text etc)
- */
-sal_Bool GtkSalGraphics::drawNativeControlText(    ControlType,
-                                ControlPart,
-                                const Rectangle&,
-                                ControlState,
-                                const ImplControlValue&,
-                                const OUString& )
-{
-    return( sal_False );
-}
-
-
-/*
  * GetNativeControlRegion()
  *
  *  If the return value is sal_True, rNativeBoundingRegion
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx
index 8ff0ce5..adee91e 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -1179,10 +1179,6 @@ class KDESalGraphics : public X11SalGraphics
                                     const Rectangle& rControlRegion, ControlState nState,
                                     const ImplControlValue& aValue,
                                     const OUString& aCaption );
-    virtual sal_Bool drawNativeControlText( ControlType nType, ControlPart nPart,
-                                        const Rectangle& rControlRegion, ControlState nState,
-                                        const ImplControlValue& aValue,
-                                        const OUString& aCaption );
     virtual sal_Bool getNativeControlRegion( ControlType nType, ControlPart nPart,
                                          const Rectangle& rControlRegion, ControlState nState,
                                          const ImplControlValue& aValue,
@@ -1471,29 +1467,6 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType nType, ControlPart nPart
     return bReturn;
 }
 
-
-/** Draw text on the widget.
-
-    OPTIONAL. Draws the requested text for the control described by nPart/nState.
-    Used if text is not drawn by DrawNativeControl().
-
-    @param rControlRegion
-    The bounding region of the complete control in VCL frame coordinates.
-
-    @param aValue
-    An optional value (tristate/numerical/string)
-
-    @param aCaption
-    A caption or title string (like button text etc.)
-*/
-sal_Bool KDESalGraphics::drawNativeControlText( ControlType, ControlPart,
-                                            const Rectangle&, ControlState,
-                                            const ImplControlValue&,
-                                            const OUString& )
-{
-    return sal_False;
-}
-
 /** Check if the bounding regions match.
 
     If the return value is sal_True, rNativeBoundingRegion
diff --git a/vcl/unx/kde4/KDESalGraphics.hxx b/vcl/unx/kde4/KDESalGraphics.hxx
index 2f4c3f3..dd4ef01 100644
--- a/vcl/unx/kde4/KDESalGraphics.hxx
+++ b/vcl/unx/kde4/KDESalGraphics.hxx
@@ -78,18 +78,6 @@ class KDESalGraphics : public X11SalGraphics
                                         const ImplControlValue& aValue,
                                         const rtl::OUString& aCaption );
 
-        /** Draw text on the widget.
-            OPTIONAL. Draws the requested text for the control described by part/nControlState.
-            Used if text is not drawn by DrawNativeControl().
-
-            @param rControlRegion The bounding region of the complete control in VCL frame coordinates.
-            @param aValue An optional value (tristate/numerical/string)
-            @param aCaption A caption or title string (like button text etc.)
-        */
-        virtual sal_Bool drawNativeControlText( ControlType, ControlPart,
-                                            const Rectangle&, ControlState,
-                                            const ImplControlValue&,
-                                            const rtl::OUString& ) { return false; }
         /** Check if the bounding regions match.
 
             If the return value is TRUE, rNativeBoundingRegion
diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index 84910f3..36b345a 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -1173,28 +1173,6 @@ sal_Bool WinSalGraphics::drawNativeControl( ControlType nType,
     return bOk;
 }
 
-
-/*
- * DrawNativeControlText()
- *
- *  OPTIONAL.  Draws the requested text for the control described by nPart/nState.
- *     Used if text not drawn by DrawNativeControl().
- *
- *  rControlRegion: The bounding region of the complete control in VCL frame coordinates.
- *  aValue:         An optional value (tristate/numerical/string)
- *  aCaption:   A caption or title string (like button text etc)
- */
-sal_Bool WinSalGraphics::drawNativeControlText( ControlType,
-                                ControlPart,
-                                const Rectangle&,
-                                ControlState,
-                                const ImplControlValue&,
-                                const OUString& )
-{
-    return( false );
-}
-
-
 /*
  * GetNativeControlRegion()
  *


More information about the Libreoffice-commits mailing list