WB_BOLDTEXT,WB_FRAMEINFO,WB_WEEKNUMBER are dead

since commit 6c759da0442f5123a4a4355e8dc9c926a49d25d7
"delete workben"

Change-Id: Ie1f399a7a8179c7727491f4ab7b4b2772fd130b8
Reviewed-on: https://gerrit.libreoffice.org/41286
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

2 files changed, 1 insertions, 97 deletions

diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx
index a70644256e79..345f3552ff1b 100644
--- a/include/svtools/calendar.hxx
+++ b/include/svtools/calendar.hxx
@@ -58,14 +58,9 @@ WinBits
 WB_BORDER                   We draw a border around the window.
 WB_TABSTOP                  Keyboard control is possible. We get the focus, when
                             the user clicks in the Control.
-WB_BOLDTEXT                 We format by bold texts and DIB_BOLD is evaluated by
-                            AddDateInfo()
-WB_FRAMEINFO                We format in a way, so that FrameInfo can be displayed
-                            and the FrameColor is evaluated by AddDateInfo()
 WB_RANGESELECT              The user can select multiple days, which need to be
                             consecutive
 WB_MULTISELECT              The user can select multiple days
-WB_WEEKNUMBER               We also display the weekdays
 
 --------------------------------------------------------------------------
 
@@ -130,9 +125,6 @@ calls or by ending a selection.
 
 *************************************************************************/
 
-#define WB_BOLDTEXT                 ((WinBits)0x00008000)
-#define WB_FRAMEINFO                ((WinBits)0x00010000)
-#define WB_WEEKNUMBER               ((WinBits)0x00020000)
 // Needs to be in agreement with the WinBits in the TabBar or
 // we move it to \vcl\inc\wintypes.hxx
 #ifndef WB_RANGESELECT
@@ -184,7 +176,6 @@ private:
     long            mnLines;
     long            mnDayWidth;
     long            mnDayHeight;
-    long            mnWeekWidth;
     WinBits         mnWinStyle;
     sal_Int16       mnFirstYear;
     sal_Int16       mnLastYear;
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index b60e68df6331..ec424b404be7 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -42,7 +42,6 @@
 #define DAY_OFFY                        2
 #define MONTH_BORDERX                   4
 #define MONTH_OFFY                      3
-#define WEEKNUMBER_OFFX                 4
 #define WEEKDAY_OFFY                    3
 #define TITLE_OFFY                      3
 #define TITLE_BORDERY                   2
@@ -319,35 +318,12 @@ void Calendar::ImplFormat()
 
         vcl::Font aOldFont = GetFont();
 
-        // Wochenanzeige beruecksichtigen
-        if ( mnWinStyle & WB_WEEKNUMBER )
-        {
-            vcl::Font aTempFont = aOldFont;
-            ImplGetWeekFont( aTempFont );
-            SetFont( aTempFont );
-            mnWeekWidth = GetTextWidth( a99Text )+WEEKNUMBER_OFFX;
-            SetFont( aOldFont );
-        }
-        else
-            mnWeekWidth = 0;
-
-        if ( mnWinStyle & WB_BOLDTEXT )
-        {
-            vcl::Font aFont = aOldFont;
-            if ( aFont.GetWeight() < WEIGHT_BOLD )
-                aFont.SetWeight( WEIGHT_BOLD );
-            else
-                aFont.SetWeight( WEIGHT_NORMAL );
-            SetFont( aFont );
-        }
-
         long n99TextWidth = GetTextWidth( a99Text );
         long nTextHeight = GetTextHeight();
 
         // calculate width and x-position
         mnDayWidth      = n99TextWidth+DAY_OFFX;
         mnMonthWidth    = mnDayWidth*7;
-        mnMonthWidth   += mnWeekWidth;
         mnMonthWidth   += MONTH_BORDERX*2;
         mnMonthPerLine  = aOutSize.Width() / mnMonthWidth;
         if ( !mnMonthPerLine )
@@ -356,7 +332,6 @@ void Calendar::ImplFormat()
         mnMonthWidth   += nOver;
         mnDaysOffX      = MONTH_BORDERX;
         mnDaysOffX     += nOver/2;
-        mnDaysOffX     += mnWeekWidth;
 
         // calculate height and y-position
         mnDayHeight     = nTextHeight + DAY_OFFY;
@@ -380,9 +355,6 @@ void Calendar::ImplFormat()
         maNextRect.Right()  = maNextRect.Left()+nSpinSize;
         maNextRect.Bottom() = maNextRect.Top()+nSpinSize;
 
-        if ( mnWinStyle & WB_BOLDTEXT )
-            SetFont( aOldFont );
-
         // Calculate DayOfWeekText (gets displayed in a narrow font)
         maDayOfWeekText.clear();
         long nStartOffX = 0;
@@ -393,8 +365,6 @@ void Calendar::ImplFormat()
             OUString aDayOfWeek( maCalendarWrapper.getDisplayName(
                         i18n::CalendarDisplayIndex::DAY, nDay, 2));
             long nOffX = (mnDayWidth-GetTextWidth( aDayOfWeek ))/2;
-            if ( mnWinStyle & WB_BOLDTEXT )
-                nOffX++;
             if ( !nDayOfWeek )
                 nStartOffX = nOffX;
             else
@@ -862,40 +832,9 @@ void Calendar::ImplDraw(vcl::RenderContext& rRenderContext)
             nDeltaY = nDayY + mnDayHeight;
             rRenderContext.SetLineColor(rStyleSettings.GetWindowTextColor());
             Point aStartPos(nDayX, nDeltaY);
-            if (mnWinStyle & WB_WEEKNUMBER)
-                aStartPos.X() -= WEEKNUMBER_OFFX - 2;
             rRenderContext.DrawLine(aStartPos, Point(nDayX + (7 * mnDayWidth), nDeltaY));
             rRenderContext.DrawTextArray(Point(nDayX + mnDayOfWeekAry[0], nDayY), maDayOfWeekText, &(mnDayOfWeekAry[1]));
 
-            // display weeknumbers
-            if (mnWinStyle & WB_WEEKNUMBER)
-            {
-                nDayX = nX + mnDaysOffX;
-                nDayY = nY + mnWeekDayOffY;
-                nDeltaY = nDayY + mnDayHeight;
-                long nMonthHeight = mnDayHeight * 6;
-                rRenderContext.DrawLine(Point(nDayX - WEEKNUMBER_OFFX + 2, nDeltaY),
-                                        Point(nDayX - WEEKNUMBER_OFFX + 2, nDeltaY + nMonthHeight));
-                vcl::Font aOldFont = rRenderContext.GetFont();
-                vcl::Font aTempFont = aOldFont;
-                ImplGetWeekFont(aTempFont);
-                rRenderContext.SetFont(aTempFont);
-                nDayX -= mnWeekWidth;
-                nDayY = nY + mnDaysOffY;
-                maCalendarWrapper.setGregorianDateTime(aDate);
-                for (sal_uInt16 nWeekCount = 0; nWeekCount < 6; ++nWeekCount)
-                {
-                    sal_Int32 nWeek = maCalendarWrapper.getValue(i18n::CalendarFieldIndex::WEEK_OF_YEAR);
-                    OUString aWeekText(OUString::number(nWeek));
-                    long nOffX = (mnWeekWidth - WEEKNUMBER_OFFX) - rRenderContext.GetTextWidth(aWeekText);
-                    long nOffY = (mnDayHeight - GetTextHeight()) / 2;
-                    rRenderContext.DrawText(Point(nDayX + nOffX, nDayY + nOffY), aWeekText);
-                    nDayY += mnDayHeight;
-                    maCalendarWrapper.addValue(i18n::CalendarFieldIndex::DAY_OF_MONTH, 7);
-                }
-                rRenderContext.SetFont(aOldFont);
-            }
-
             // display days
             sal_uInt16 nDaysInMonth = aDate.GetDaysInMonth();
             nDayX = nX + mnDaysOffX;
@@ -1899,37 +1838,11 @@ Size Calendar::CalcWindowSizePixel() const
     OUString  a99Text("99");
     vcl::Font aOldFont = GetFont();
 
-    // take display of week into account
-    long nWeekWidth;
-    if ( mnWinStyle & WB_WEEKNUMBER )
-    {
-        vcl::Font aTempFont = aOldFont;
-        ImplGetWeekFont( aTempFont );
-        const_cast<Calendar*>(this)->SetFont( aTempFont );
-        nWeekWidth = GetTextWidth( a99Text )+WEEKNUMBER_OFFX;
-        const_cast<Calendar*>(this)->SetFont( aOldFont );
-    }
-    else
-        nWeekWidth = 0;
-
-    if ( mnWinStyle & WB_BOLDTEXT )
-    {
-        vcl::Font aFont = aOldFont;
-        if ( aFont.GetWeight() < WEIGHT_BOLD )
-            aFont.SetWeight( WEIGHT_BOLD );
-        else
-            aFont.SetWeight( WEIGHT_NORMAL );
-        const_cast<Calendar*>(this)->SetFont( aFont );
-    }
-
     Size    aSize;
     long    n99TextWidth = GetTextWidth( a99Text );
     long    nTextHeight = GetTextHeight();
 
-    if ( mnWinStyle & WB_BOLDTEXT )
-        const_cast<Calendar*>(this)->SetFont( aOldFont );
-
-    aSize.Width()  += ((n99TextWidth+DAY_OFFX)*7) + nWeekWidth;
+    aSize.Width()  += ((n99TextWidth+DAY_OFFX)*7);
     aSize.Width()  += MONTH_BORDERX*2;
 
     aSize.Height()  = nTextHeight + TITLE_OFFY + (TITLE_BORDERY*2);