sb123:merge

5 files changed, 20 insertions, 17 deletions

diff --git a/toolkit/inc/toolkit/awt/vclxsystemdependentwindow.hxx b/toolkit/inc/toolkit/awt/vclxsystemdependentwindow.hxx
index 5448bfaff320..73bd100c2bb7 100644
--- a/toolkit/inc/toolkit/awt/vclxsystemdependentwindow.hxx
+++ b/toolkit/inc/toolkit/awt/vclxsystemdependentwindow.hxx
@@ -40,8 +40,8 @@
 //  class VCLXSystemDependendtWindow
 //  ----------------------------------------------------
 
-class VCLXSystemDependentWindow :   public ::com::sun::star::awt::XSystemDependentWindowPeer,
-                                    public VCLXWindow
+class TOOLKIT_DLLPUBLIC VCLXSystemDependentWindow : public ::com::sun::star::awt::XSystemDependentWindowPeer,
+                                                    public VCLXWindow
 {
 public:
     VCLXSystemDependentWindow();
diff --git a/toolkit/inc/toolkit/controls/unocontrolmodel.hxx b/toolkit/inc/toolkit/controls/unocontrolmodel.hxx
index a443cb4d2d6b..71decdfcb2c9 100644
--- a/toolkit/inc/toolkit/controls/unocontrolmodel.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrolmodel.hxx
@@ -53,17 +53,17 @@ class ImplPropertyTable;
 //  class UnoControlModel
 //  ----------------------------------------------------
 
-class UnoControlModel : public ::com::sun::star::awt::XControlModel,
-                        public ::com::sun::star::beans::XPropertyState,
-                        public ::com::sun::star::io::XPersistObject,
-                        public ::com::sun::star::lang::XComponent,
-                        public ::com::sun::star::lang::XServiceInfo,
-                        public ::com::sun::star::lang::XTypeProvider,
-                        public ::com::sun::star::lang::XUnoTunnel,
-                        public ::com::sun::star::util::XCloneable,
-                        public MutexAndBroadcastHelper,
-                        public ::cppu::OPropertySetHelper,
-                        public ::cppu::OWeakAggObject
+class TOOLKIT_DLLPUBLIC UnoControlModel :   public ::com::sun::star::awt::XControlModel,
+                                            public ::com::sun::star::beans::XPropertyState,
+                                            public ::com::sun::star::io::XPersistObject,
+                                            public ::com::sun::star::lang::XComponent,
+                                            public ::com::sun::star::lang::XServiceInfo,
+                                            public ::com::sun::star::lang::XTypeProvider,
+                                            public ::com::sun::star::lang::XUnoTunnel,
+                                            public ::com::sun::star::util::XCloneable,
+                                            public MutexAndBroadcastHelper,
+                                            public ::cppu::OPropertySetHelper,
+                                            public ::cppu::OWeakAggObject
 {
 private:
     ImplPropertyTable*          mpData;
diff --git a/toolkit/inc/toolkit/helper/unopropertyarrayhelper.hxx b/toolkit/inc/toolkit/helper/unopropertyarrayhelper.hxx
index 2a42d05b72fd..5b5cb3021fc9 100644
--- a/toolkit/inc/toolkit/helper/unopropertyarrayhelper.hxx
+++ b/toolkit/inc/toolkit/helper/unopropertyarrayhelper.hxx
@@ -28,6 +28,7 @@
 #ifndef _TOOLKIT_HELPER_UNOPROPERTYARRAYHELPER_HXX_
 #define _TOOLKIT_HELPER_UNOPROPERTYARRAYHELPER_HXX_
 
+#include <toolkit/dllapi.h>
 #include <cppuhelper/propshlp.hxx>
 
 #include <tools/table.hxx>
@@ -37,7 +38,7 @@
 //  ----------------------------------------------------
 //  class UnoPropertyArrayHelper
 //  ----------------------------------------------------
-class UnoPropertyArrayHelper : public ::cppu::IPropertyArrayHelper
+class TOOLKIT_DLLPUBLIC UnoPropertyArrayHelper : public ::cppu::IPropertyArrayHelper
 {
 private:
     Table       maIDs;
diff --git a/toolkit/prj/d.lst b/toolkit/prj/d.lst
index 0c62a083b330..375485c96e4d 100644
--- a/toolkit/prj/d.lst
+++ b/toolkit/prj/d.lst
@@ -24,6 +24,7 @@ mkdir: %_DEST%\inc%_EXT%\toolkit\controls
 ..\inc\toolkit\awt\vclxtopwindow.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxtopwindow.hxx
 ..\inc\toolkit\awt\vclxtoolkit.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxtoolkit.hxx
 ..\inc\toolkit\awt\vclxwindow.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxwindow.hxx
+..\inc\toolkit\awt\vclxsystemdependentwindow.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxsystemdependentwindow.hxx
 ..\source\awt\vclxdialog.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxdialog.hxx
 ..\inc\toolkit\awt\vclxwindows.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxwindows.hxx
 ..\inc\toolkit\awt\vclxmenu.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxmenu.hxx
@@ -47,6 +48,7 @@ mkdir: %_DEST%\inc%_EXT%\toolkit\controls
 ..\inc\toolkit\helper\formpdfexport.hxx %_DEST%\inc%_EXT%\toolkit\helper/formpdfexport.hxx
 ..\inc\toolkit\helper\accessiblefactory.hxx %_DEST%\inc%_EXT%\toolkit\helper\accessiblefactory.hxx
 ..\inc\toolkit\helper\fixedhyperbase.hxx %_DEST%\inc%_EXT%\toolkit\helper\fixedhyperbase.hxx
+..\inc\toolkit\helper\unopropertyarrayhelper.hxx %_DEST%\inc%_EXT%\toolkit\helper\unopropertyarrayhelper.hxx
 
 ..\inc\toolkit\helper\vclunohelper.hxx %_DEST%\inc%_EXT%\toolkit\unohlp.hxx
 ..\inc\toolkit\dllapi.h %_DEST%\inc%_EXT%\toolkit\dllapi.h
diff --git a/toolkit/source/helper/property.cxx b/toolkit/source/helper/property.cxx
index 9a3dc7b9bfb3..3a83465a3218 100644
--- a/toolkit/source/helper/property.cxx
+++ b/toolkit/source/helper/property.cxx
@@ -284,9 +284,9 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount )
             DECL_PROP_3     ( "SelectionModel",         GRID_SELECTIONMODE,     ::com::sun::star::view::SelectionType,          BOUND, MAYBEDEFAULT, MAYBEVOID ),
             DECL_PROP_2     ( "EnableVisible",          ENABLEVISIBLE,          sal_Bool,           BOUND, MAYBEDEFAULT ),
             DECL_PROP_3     ( "ReferenceDevice",        REFERENCE_DEVICE,       Reference< XDevice >,BOUND, MAYBEDEFAULT, TRANSIENT ),
-            DECL_PROP_3     ( "EvenRowBackgroundColor",  GRID_EVEN_ROW_BACKGROUND,     sal_Int32,      BOUND, MAYBEDEFAULT, MAYBEVOID ),
-            DECL_PROP_3     ( "HeaderBackgroundColor",   GRID_HEADER_BACKGROUND,       sal_Int32,      BOUND, MAYBEDEFAULT, MAYBEVOID ),
-            DECL_PROP_3     ( "LineColor",               GRID_LINE_COLOR,              sal_Int32,      BOUND, MAYBEDEFAULT, MAYBEVOID ),
+            DECL_PROP_3     ( "EvenRowBackgroundColor", GRID_EVEN_ROW_BACKGROUND, sal_Int32,      BOUND, MAYBEDEFAULT, MAYBEVOID ),
+            DECL_PROP_3     ( "HeaderBackgroundColor",  GRID_HEADER_BACKGROUND,  sal_Int32,      BOUND, MAYBEDEFAULT, MAYBEVOID ),
+            DECL_PROP_3     ( "GridLineColor",          GRID_LINE_COLOR,         sal_Int32,      BOUND, MAYBEDEFAULT, MAYBEVOID ),
             DECL_PROP_3     ( "RowBackgroundColor",     GRID_ROW_BACKGROUND,     sal_Int32,      BOUND, MAYBEDEFAULT, MAYBEVOID )
     };
             pPropertyInfos = aImplPropertyInfos;