CWS-TOOLING: integrate CWS vcl117ooo/DEV300_m97

18 files changed, 26 insertions, 28 deletions

diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx
index d6bab94cb..24b507cdb 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx
@@ -34,7 +34,7 @@
 #include "accessibility/extended/accessiblebrowseboxcell.hxx"
 #endif
 #include <cppuhelper/implbase2.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 // ============================================================================
 namespace accessibility
 {
diff --git a/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx b/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
index 8444ed9ed..16c996f27 100644
--- a/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
+++ b/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
@@ -29,8 +29,7 @@
 
 #include <tools/gen.hxx>
 #include <tools/string.hxx>
-#include <vcl/wintypes.hxx>
-#include <tools/gen.hxx>
+#include <tools/wintypes.hxx>
 
 namespace com { namespace sun { namespace star { namespace datatransfer { namespace clipboard {
     class XClipboard;
diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx
index 0cdc26a10..5d88b6d5e 100644
--- a/automation/source/server/statemnt.cxx
+++ b/automation/source/server/statemnt.cxx
@@ -34,7 +34,7 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/uieventslogger.hxx>
 
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #ifndef _DIALOG_HXX //autogen
 #include <vcl/dialog.hxx>
 #endif
@@ -79,7 +79,6 @@
 #include <vcl/fixed.hxx>
 #include <vcl/wrkwin.hxx>
 #include <osl/diagnose.h>
-#include <vcl/wintypes.hxx>
 #include <svtools/valueset.hxx>
 #include <svtools/roadmap.hxx>
 #include <svtools/table/tablecontrol.hxx>
diff --git a/automation/source/server/statemnt.hxx b/automation/source/server/statemnt.hxx
index b0d2f6c4b..01db8775e 100644
--- a/automation/source/server/statemnt.hxx
+++ b/automation/source/server/statemnt.hxx
@@ -40,7 +40,7 @@
 #ifndef _STATEMNT_HXX
 #define _STATEMNT_HXX
 
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include <tools/string.hxx>
 #include <tools/debug.hxx>
 #include <tools/time.hxx>
diff --git a/basctl/source/basicide/basicprint.src b/basctl/source/basicide/basicprint.src
index a5d9a8351..caa5241c5 100644
--- a/basctl/source/basicide/basicprint.src
+++ b/basctl/source/basicide/basicprint.src
@@ -33,8 +33,6 @@ StringArray RID_PRINTDLG_STRLIST
     {
         < "Print range"; >;
         < "All ~Pages"; >;
-        < "Print all pages of the printable content."; >;
         < "Pa~ges"; >;
-        < "Print only some pages of the printable content."; >;
     };
 };
diff --git a/basctl/source/basicide/basicrenderable.cxx b/basctl/source/basicide/basicrenderable.cxx
index d1679c76a..e374d8177 100644
--- a/basctl/source/basicide/basicrenderable.cxx
+++ b/basctl/source/basicide/basicrenderable.cxx
@@ -45,8 +45,8 @@ BasicRenderable::BasicRenderable( IDEBaseWindow* pWin )
 , mpWindow( pWin )
 {
     ResStringArray aStrings( IDEResId( RID_PRINTDLG_STRLIST )  );
-    DBG_ASSERT( aStrings.Count() >= 5, "resource incomplete" );
-    if( aStrings.Count() < 5 ) // bad resource ?
+    DBG_ASSERT( aStrings.Count() >= 3, "resource incomplete" );
+    if( aStrings.Count() < 3 ) // bad resource ?
         return;
 
     m_aUIProperties.realloc( 3 );
@@ -63,13 +63,13 @@ BasicRenderable::BasicRenderable( IDEBaseWindow* pWin )
     // create a choice for the range to print
     rtl::OUString aPrintContentName( RTL_CONSTASCII_USTRINGPARAM( "PrintContent" ) );
     Sequence< rtl::OUString > aChoices( 2 );
-    Sequence< rtl::OUString > aHelpTexts( 2 );
+    Sequence< rtl::OUString > aHelpIds( 2 );
     aChoices[0] = aStrings.GetString( 1 );
-    aHelpTexts[0] = aStrings.GetString( 2 );
-    aChoices[1] = aStrings.GetString( 3 );
-    aHelpTexts[1] = aStrings.GetString( 4 );
+    aHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0" ) );
+    aChoices[1] = aStrings.GetString( 2 );
+    aHelpIds[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1" ) );
     m_aUIProperties[1].Value = getChoiceControlOpt( rtl::OUString(),
-                                                    aHelpTexts,
+                                                    aHelpIds,
                                                     aPrintContentName,
                                                     aChoices,
                                                     0 );
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 3448e5095..07c61d133 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -945,12 +945,14 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe
 
     aColorBoxes[0]->SetHelpId( aColorLBHids[0] );
 
+    OSL_ENSURE( nCount < sal_Int32(sizeof(aColorLBHids)/sizeof(aColorLBHids[0])), "too few helpIDs for color listboxes" ); 
     for( sal_Int32 i = 1; i < nCount; i++ )
     {
         if(aColorBoxes[i])
         {
             aColorBoxes[i]->CopyEntries( *aColorBoxes[0] );
-            aColorBoxes[i]->SetHelpId( aColorLBHids[i] );
+            if( i < sal_Int32(sizeof(aColorLBHids)/sizeof(aColorLBHids[0])) )
+               aColorBoxes[i]->SetHelpId( aColorLBHids[i] );
         }
     }
 }
diff --git a/extensions/inc/pch/precompiled_extensions.hxx b/extensions/inc/pch/precompiled_extensions.hxx
index 76724e1fc..b909c5866 100644..100755
--- a/extensions/inc/pch/precompiled_extensions.hxx
+++ b/extensions/inc/pch/precompiled_extensions.hxx
@@ -533,7 +533,7 @@
 #include "unotools/processfactory.hxx"
 
 
-#include "vcl/fldunit.hxx"
+#include "tools/fldunit.hxx"
 
 #include "vos/conditn.hxx"
 #include "vos/diagnose.hxx"
diff --git a/extensions/source/propctrlr/formcomponenthandler.hxx b/extensions/source/propctrlr/formcomponenthandler.hxx
index 37b07c238..df844e897 100644
--- a/extensions/source/propctrlr/formcomponenthandler.hxx
+++ b/extensions/source/propctrlr/formcomponenthandler.hxx
@@ -41,7 +41,7 @@
 #include <com/sun/star/awt/XControlContainer.hpp>
 #include <com/sun/star/form/XForm.hpp>
 /** === end UNO includes === **/
-#include <vcl/fldunit.hxx>
+#include <tools/fldunit.hxx>
 #include <vcl/waitobj.hxx>
 #include <connectivity/dbtools.hxx>
 
diff --git a/forms/inc/pch/precompiled_forms.hxx b/forms/inc/pch/precompiled_forms.hxx
index 4e31cc6a5..ba5bacbac 100644..100755
--- a/forms/inc/pch/precompiled_forms.hxx
+++ b/forms/inc/pch/precompiled_forms.hxx
@@ -389,10 +389,10 @@
 #include "vcl/bmpacc.hxx"
 #include "vcl/cvtgrf.hxx"
 #include "vcl/mapmod.hxx"
-#include "vcl/mapunit.hxx"
+#include "tools/mapunit.hxx"
 #include "vcl/stdtext.hxx"
 #include "vcl/timer.hxx"
-#include "vcl/wintypes.hxx"
+#include "tools/wintypes.hxx"
 
 #include "vos/mutex.hxx"
 #include "vos/thread.hxx"
diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx
index 3ded17a1d..f8097e0aa 100644
--- a/forms/source/component/Edit.cxx
+++ b/forms/source/component/Edit.cxx
@@ -39,7 +39,7 @@
 #include <com/sun/star/awt/XVclWindowPeer.hpp>
 
 #include <vcl/svapp.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 
 #include <connectivity/dbtools.hxx>
 #include <connectivity/formattedcolumnvalue.hxx>
diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx
index 49b0779dc..a9a5e93ec 100644
--- a/forms/source/component/Filter.cxx
+++ b/forms/source/component/Filter.cxx
@@ -72,7 +72,7 @@
 #include <unotools/localedatawrapper.hxx>
 #include <vcl/stdtext.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 
 //--------------------------------------------------------------------------
 extern "C" void SAL_CALL createRegistryInfo_OFilterControl()
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index e8fd2f991..5850d6f73 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -43,7 +43,7 @@
 #include <svl/numuno.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/debug.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include <i18npool/mslangid.hxx>
 #include <rtl/textenc.h>
 #include <com/sun/star/sdbc/DataType.hpp>
diff --git a/forms/source/richtext/richtextcontrol.hxx b/forms/source/richtext/richtextcontrol.hxx
index e4ba4d401..cc23fd886 100644
--- a/forms/source/richtext/richtextcontrol.hxx
+++ b/forms/source/richtext/richtextcontrol.hxx
@@ -37,7 +37,7 @@
 #include <comphelper/uno3.hxx>
 #include <comphelper/implementationreference.hxx>
 #include <cppuhelper/implbase1.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include "rtattributes.hxx"
 #include "attributedispatcher.hxx"
 
diff --git a/forms/source/richtext/richtextengine.cxx b/forms/source/richtext/richtextengine.cxx
index 63b16f943..8659c24a5 100644
--- a/forms/source/richtext/richtextengine.cxx
+++ b/forms/source/richtext/richtextengine.cxx
@@ -38,7 +38,7 @@
 #define ITEMID_LANGUAGE     EE_CHAR_LANGUAGE
 #include <editeng/langitem.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/mapunit.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/mapmod.hxx>
 #include <vcl/outdev.hxx>
 #include <unotools/lingucfg.hxx>
diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx
index c6918be2e..d2aa62ae9 100644
--- a/forms/source/richtext/richtextimplcontrol.cxx
+++ b/forms/source/richtext/richtextimplcontrol.cxx
@@ -42,7 +42,7 @@
 #include <editeng/editobj.hxx>
 #include <svl/itempool.hxx>
 #include <svl/itemset.hxx>
-#include <vcl/mapunit.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/window.hxx>
 #include <vcl/svapp.hxx>
 
diff --git a/forms/source/richtext/rtattributehandler.cxx b/forms/source/richtext/rtattributehandler.cxx
index 5a4957e37..1888e3471 100644
--- a/forms/source/richtext/rtattributehandler.cxx
+++ b/forms/source/richtext/rtattributehandler.cxx
@@ -35,7 +35,7 @@
 #include <editeng/eeitem.hxx>
 #include <svl/itemset.hxx>
 #include <svl/itempool.hxx>
-#include <vcl/mapunit.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/mapmod.hxx>
 #include <vcl/outdev.hxx>
 
diff --git a/forms/source/solar/component/navbarcontrol.hxx b/forms/source/solar/component/navbarcontrol.hxx
index 2e585a455..0af5b0074 100644
--- a/forms/source/solar/component/navbarcontrol.hxx
+++ b/forms/source/solar/component/navbarcontrol.hxx
@@ -39,7 +39,7 @@
 #include <toolkit/awt/vclxwindow.hxx>
 #include <comphelper/uno3.hxx>
 #include <cppuhelper/implbase1.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 
 //.........................................................................
 namespace frm