undoapi: pulled and merged DEV300.m98

9 files changed, 32 insertions, 19 deletions

diff --git a/toolkit/AllLangResTarget_tk.mk b/toolkit/AllLangResTarget_tk.mk
index 571d5dfbff70..784063934112 100644
--- a/toolkit/AllLangResTarget_tk.mk
+++ b/toolkit/AllLangResTarget_tk.mk
@@ -27,7 +27,7 @@
 
 $(eval $(call gb_AllLangResTarget_AllLangResTarget,tk))
 
-$(eval $(call gb_AllLangResTarget_set_reslocation,tk,toolkit/source/awt))
+$(eval $(call gb_AllLangResTarget_set_reslocation,tk,toolkit))
 
 $(eval $(call gb_AllLangResTarget_add_srs,tk,\
     toolkit/awt \
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index 9d94c76314f1..ab51c1e282bb 100644
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@ -166,10 +166,23 @@ $(eval $(call gb_Library_add_linked_libs,tk,\
 ))
 endif
 ifeq ($(OS),WNT)
+ifneq ($(USE_MINGW),)
+$(eval $(call gb_Library_add_linked_libs,tk,\
+    mingwthrd \
+    $(gb_MINGW_LIBSTDCPP) \
+    mingw32 \
+    $(gb_MINGW_LIBGCC) \
+    uwinapi \
+    mingwex \
+    kernel32 \
+    msvcrt \
+))
+else
 $(eval $(call gb_Library_add_linked_libs,tk,\
     kernel32 \
     msvcrt \
     uwinapi \
 ))
 endif
+endif
 # vim: set noet sw=4 ts=4:
diff --git a/toolkit/inc/layout/layout.hxx b/toolkit/inc/layout/layout.hxx
index 5d013e8a74c4..b4b219b850e2 100644
--- a/toolkit/inc/layout/layout.hxx
+++ b/toolkit/inc/layout/layout.hxx
@@ -38,9 +38,9 @@
 #include <tools/string.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/combobox.h>
-#include <vcl/fldunit.hxx>
+#include <tools/fldunit.hxx>
 #include <vcl/lstbox.h>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 
 class Button;
 class ComboBox;
diff --git a/toolkit/inc/pch/precompiled_toolkit.hxx b/toolkit/inc/pch/precompiled_toolkit.hxx
index d0baff3b8343..77be02429484 100644
--- a/toolkit/inc/pch/precompiled_toolkit.hxx
+++ b/toolkit/inc/pch/precompiled_toolkit.hxx
@@ -327,7 +327,7 @@
 #include "vcl/gradient.hxx"
 #include "vcl/image.hxx"
 #include "vcl/jobset.hxx"
-#include "vcl/mapunit.hxx"
+#include "tools/mapunit.hxx"
 #include "vcl/menu.hxx"
 #include "vcl/metric.hxx"
 #include "vcl/outdev.hxx"
diff --git a/toolkit/inc/toolkit/awt/vclxtoolkit.hxx b/toolkit/inc/toolkit/awt/vclxtoolkit.hxx
index 3f37ac58200f..31de39bf1fc3 100644
--- a/toolkit/inc/toolkit/awt/vclxtoolkit.hxx
+++ b/toolkit/inc/toolkit/awt/vclxtoolkit.hxx
@@ -41,7 +41,7 @@
 #include <osl/mutex.hxx>
 #include <osl/module.h>
 #include <tools/link.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 
 #include <toolkit/dllapi.h>
 
diff --git a/toolkit/inc/toolkit/helper/vclunohelper.hxx b/toolkit/inc/toolkit/helper/vclunohelper.hxx
index cc11f3a586bb..fc35c480d854 100644
--- a/toolkit/inc/toolkit/helper/vclunohelper.hxx
+++ b/toolkit/inc/toolkit/helper/vclunohelper.hxx
@@ -64,8 +64,8 @@ namespace com { namespace sun { namespace star { namespace awt {
 #include <vcl/bitmapex.hxx>
 #include <vcl/region.hxx>
 #include <vcl/metric.hxx>
-#include <vcl/mapunit.hxx>
-#include <vcl/fldunit.hxx>
+#include <tools/mapunit.hxx>
+#include <tools/fldunit.hxx>
 #include <tools/poly.hxx>
 
 class Window;
diff --git a/toolkit/source/awt/vclxplugin.hxx b/toolkit/source/awt/vclxplugin.hxx
index 49a2b2950854..2b42eecc5872 100644
--- a/toolkit/source/awt/vclxplugin.hxx
+++ b/toolkit/source/awt/vclxplugin.hxx
@@ -29,7 +29,7 @@
 #define LAYOUT_AWT_VCLXPLUGIN_HXX
 
 #include <toolkit/awt/vclxwindow.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 
 class Control;
 namespace layoutimpl
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index 06c9167336a8..6c6b9dc4b2c8 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -173,7 +173,7 @@ namespace toolkit
         _pWindow->SetStyle( nStyle );
     }
 
-    static void setVisualEffect( const Any& _rValue, Window* _pWindow, void (StyleSettings::*pSetter)( USHORT ), sal_Int16 _nFlatBits, sal_Int16 _n3DBits )
+    static void setVisualEffect( const Any& _rValue, Window* _pWindow )
     {
         AllSettings aSettings = _pWindow->GetSettings();
         StyleSettings aStyleSettings = aSettings.GetStyleSettings();
@@ -183,22 +183,22 @@ namespace toolkit
         switch ( nStyle )
         {
         case FLAT:
-            (aStyleSettings.*pSetter)( _nFlatBits );
+            aStyleSettings.SetOptions( aStyleSettings.GetOptions() & ~STYLE_OPTION_MONO );
             break;
         case LOOK3D:
         default:
-            (aStyleSettings.*pSetter)( _n3DBits );
+            aStyleSettings.SetOptions( aStyleSettings.GetOptions() | STYLE_OPTION_MONO );
         }
         aSettings.SetStyleSettings( aStyleSettings );
         _pWindow->SetSettings( aSettings );
     }
 
-    static Any getVisualEffect( Window* _pWindow, USHORT (StyleSettings::*pGetter)( ) const, sal_Int16 _nFlatBits )
+    static Any getVisualEffect( Window* _pWindow )
     {
         Any aEffect;
 
         StyleSettings aStyleSettings = _pWindow->GetSettings().GetStyleSettings();
-        if ( (aStyleSettings.*pGetter)() == _nFlatBits )
+        if ( (aStyleSettings.GetOptions() & STYLE_OPTION_MONO) )
             aEffect <<= (sal_Int16)FLAT;
         else
             aEffect <<= (sal_Int16)LOOK3D;
@@ -961,7 +961,7 @@ void VCLXCheckBox::setProperty( const ::rtl::OUString& PropertyName, const ::com
         switch ( nPropType )
         {
             case BASEPROPERTY_VISUALEFFECT:
-                ::toolkit::setVisualEffect( Value, pCheckBox, &StyleSettings::SetCheckBoxStyle, STYLE_CHECKBOX_MONO, STYLE_CHECKBOX_WIN );
+                ::toolkit::setVisualEffect( Value, pCheckBox );
                 break;
 
             case BASEPROPERTY_TRISTATE:
@@ -998,7 +998,7 @@ void VCLXCheckBox::setProperty( const ::rtl::OUString& PropertyName, const ::com
         switch ( nPropType )
         {
             case BASEPROPERTY_VISUALEFFECT:
-                aProp = ::toolkit::getVisualEffect( pCheckBox, &StyleSettings::GetCheckBoxStyle, STYLE_CHECKBOX_MONO );
+                aProp = ::toolkit::getVisualEffect( pCheckBox );
                 break;
             case BASEPROPERTY_TRISTATE:
                  aProp <<= (sal_Bool)pCheckBox->IsTriStateEnabled();
@@ -1133,7 +1133,7 @@ void VCLXRadioButton::setProperty( const ::rtl::OUString& PropertyName, const ::
         switch ( nPropType )
         {
             case BASEPROPERTY_VISUALEFFECT:
-                ::toolkit::setVisualEffect( Value, pButton, &StyleSettings::SetRadioButtonStyle, STYLE_RADIOBUTTON_MONO, STYLE_RADIOBUTTON_WIN );
+                ::toolkit::setVisualEffect( Value, pButton );
                 break;
 
             case BASEPROPERTY_STATE:
@@ -1176,7 +1176,7 @@ void VCLXRadioButton::setProperty( const ::rtl::OUString& PropertyName, const ::
         switch ( nPropType )
         {
             case BASEPROPERTY_VISUALEFFECT:
-                aProp = ::toolkit::getVisualEffect( pButton, &StyleSettings::GetRadioButtonStyle, STYLE_RADIOBUTTON_MONO );
+                aProp = ::toolkit::getVisualEffect( pButton );
                 break;
             case BASEPROPERTY_STATE:
                 aProp <<= (sal_Int16) ( pButton->IsChecked() ? 1 : 0 );
diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.cxx b/toolkit/source/controls/grid/defaultgriddatamodel.cxx
index 7ffafdf0ddb6..adc40b0426d7 100644
--- a/toolkit/source/controls/grid/defaultgriddatamodel.cxx
+++ b/toolkit/source/controls/grid/defaultgriddatamodel.cxx
@@ -198,7 +198,7 @@ void SAL_CALL DefaultGridDataModel::removeRow(::sal_Int32 index) throw (::com::s
         ::rtl::OUString headerName( (::rtl::OUString) rowHeaders[index] );
         rowHeaders.erase(rowHeaders.begin() + index);
 
-        Sequence< Any >& rowData ( (Sequence< Any >&)data[index] );
+        Sequence< Any > rowData ( (Sequence< Any >&)data[index] );
         data.erase(data.begin() + index);
         broadcast_remove( index, headerName, rowData);
     }
@@ -241,7 +241,7 @@ void SAL_CALL DefaultGridDataModel::removeAll() throw (RuntimeException)
 {
     rowHeaders.clear();
     data.clear();
-    broadcast_remove( -1, ::rtl::OUString(), 0);
+    broadcast_remove( -1, ::rtl::OUString(), Sequence< Any >());
 }
 //---------------------------------------------------------------------
 void SAL_CALL DefaultGridDataModel::setRowHeaderWidth(sal_Int32 _value) throw (::com::sun::star::uno::RuntimeException)