9 files changed, 12 insertions, 27 deletions
diff --git a/vcl/source/app/unohelp2.cxx b/vcl/source/app/unohelp2.cxx
index 125a8add987c..3d98b1219a58 100644
--- a/vcl/source/app/unohelp2.cxx
+++ b/vcl/source/app/unohelp2.cxx
@@ -76,7 +76,7 @@ namespace vcl { namespace unohelper {
         SotClipboardFormatId nT = SotExchange::GetFormat( rFlavor );
         if ( nT == SotClipboardFormatId::STRING )
         {
-            aAny <<= GetString();
+            aAny <<= maText;
         }
         else
         {
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index c5eed697ad60..ebbe3c9bb31e 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -1653,7 +1653,7 @@ Size PushButton::CalcMinimumSize() const
         else
             aSize = Size( 26, 24 );
     }
-    else if ( IsImage() && ! (ImplGetButtonState() & DrawButtonFlags::NoImage) )
+    else if ( Button::HasImage() && ! (ImplGetButtonState() & DrawButtonFlags::NoImage) )
         aSize = GetModeImage().GetSizePixel();
     if( mnDDStyle == PushButtonDropdownStyle::MenuButton )
     {
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 6e44a9d5ea41..8765e341b71d 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -1836,14 +1836,9 @@ bool CurrencyFormatter::ImplCurrencyReformat( const OUString& rStr, OUString& rO
     }
 }
 
-inline void CurrencyFormatter::ImplInit()
-{
-    mnType = FORMAT_CURRENCY;
-}
-
 CurrencyFormatter::CurrencyFormatter()
 {
-    ImplInit();
+    mnType = FORMAT_CURRENCY;
 }
 
 CurrencyFormatter::~CurrencyFormatter()
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index 80861d6cc575..499babec1d17 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -1567,16 +1567,11 @@ void DateFormatter::SetShowDateCentury( bool bShowDateCentury )
 
 void DateFormatter::SetDate( const Date& rNewDate )
 {
-    SetUserDate( rNewDate );
+    ImplSetUserDate( rNewDate );
     maFieldDate = maLastDate;
     maLastDate = GetDate();
 }
 
-void DateFormatter::SetUserDate( const Date& rNewDate )
-{
-    ImplSetUserDate( rNewDate );
-}
-
 void DateFormatter::ImplSetUserDate( const Date& rNewDate, Selection* pNewSelection )
 {
     Date aNewDate = rNewDate;
@@ -1645,7 +1640,7 @@ Date DateFormatter::GetDate() const
                     aDate = Date( Date::SYSTEM );
             }
             else
-                aDate = GetInvalidDate();
+                aDate = Date( Date::EMPTY ); // set invalid date
         }
     }
 
@@ -2478,7 +2473,7 @@ tools::Time TimeFormatter::GetTime() const
         else
         {
             if ( bAllowMailformed )
-                aTime = GetInvalidTime();
+                aTime = tools::Time( 99, 99, 99 ); // set invalid time
             else
                 aTime = maLastTime;
         }
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 84562282cfc5..2e1635f30afc 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -2180,7 +2180,7 @@ Size TabControl::GetOptimalSize() const
 
 void TabControl::queue_resize(StateChangedType eReason)
 {
-    markLayoutDirty();
+    mbLayoutDirty = true;
     Window::queue_resize(eReason);
 }
 
diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index dfc2f1ef2427..4d5c197d99fa 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -553,7 +553,7 @@ long VirtualDevice::GetFontExtLeading() const
 {
 #ifdef UNX
     // backwards compatible line metrics after fixing #i60945#
-    if ( ForceZeroExtleadBug() )
+    if ( mbForceZeroExtleadBug )
         return 0;
 #endif
 
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index 0b825980154c..e48df2e7385b 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -1043,7 +1043,7 @@ Size DockingWindow::GetOptimalSize() const
 void DockingWindow::queue_resize(StateChangedType eReason)
 {
     bool bTriggerLayout = true;
-    if (hasPendingLayout() || isCalculatingInitialLayoutSize())
+    if (maLayoutIdle.IsActive() || isCalculatingInitialLayoutSize())
     {
         bTriggerLayout = false;
     }
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 7b4d12a91d46..cfaec6b2a1aa 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -166,7 +166,7 @@ void VclContainer::SetSizePixel(const Size& rAllocation)
 
 void VclContainer::queue_resize(StateChangedType eReason)
 {
-    markLayoutDirty();
+    m_bLayoutDirty = true;
     Window::queue_resize(eReason);
 }
 
@@ -716,7 +716,7 @@ bool VclButtonBox::set_property(const OString &rKey, const OString &rValue)
         {
             SAL_WARN("vcl.layout", "unknown layout style " << rValue.getStr());
         }
-        set_layout(eStyle);
+        m_eLayoutStyle = eStyle;
     }
     else
         return VclBox::set_property(rKey, rValue);
diff --git a/vcl/source/window/openglwin.cxx b/vcl/source/window/openglwin.cxx
index b7c309c720ef..7d20fd777ad4 100644
--- a/vcl/source/window/openglwin.cxx
+++ b/vcl/source/window/openglwin.cxx
@@ -141,14 +141,9 @@ void OpenGLWindow::setRenderer(IRenderer* pRenderer)
     mpRenderer = pRenderer;
 }
 
-bool OpenGLWindow::IsInitialized() const
-{
-    return mxImpl->IsInitialized();
-}
-
 void OpenGLWindow::Initialize()
 {
-    if (!IsInitialized())
+    if (!mxImpl->IsInitialized())
         mxImpl->Initialize();
 }