Anonymous avatar Anonymous committed 52fa74a Merge

merged DEV300_m97

Comments (0)

Files changed (934)

 41b0797e09ed77cf6b719fe7c39119d682d24749 DEV300_m95
 8650e94f45129904b7dcb52e6519d0fb4a3c894d OOO330_m18
 41e86e55f8a9f2179f3d1fc1741116280d7a54e1 DEV300_m96
+19d9ebadebea40835d874a702fd86c8281d4cd52 DEV300_m97

accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx

 #include "accessibility/extended/accessiblebrowseboxcell.hxx"
 #endif
 #include <cppuhelper/implbase2.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 // ============================================================================
 namespace accessibility
 {

accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx

 
 #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;

automation/source/server/statemnt.cxx

 #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
 #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>

automation/source/server/statemnt.hxx

 #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>

basctl/source/basicide/basicprint.src

     {
         < "Print range"; >;
         < "All ~Pages"; >;
-        < "Print all pages of the printable content."; >;
         < "Pa~ges"; >;
-        < "Print only some pages of the printable content."; >;
     };
 };

basctl/source/basicide/basicrenderable.cxx

 , 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 );
     // 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 );

basic/inc/pch/precompiled_basic.hxx

 #include "vcl/timer.hxx"
 #include "vcl/toolbox.hxx"
 #include "vcl/window.hxx"
-#include "vcl/wintypes.hxx"
+#include "tools/wintypes.hxx"
 #include "vcl/wrkwin.hxx"
 
 #include "vos/diagnose.hxx"

basic/source/runtime/methods.cxx

 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/sound.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include <vcl/msgbox.hxx>
 #include <basic/sbx.hxx>
 #include <svl/zforlist.hxx>

binfilter/bf_forms/source/component/forms_Filter.cxx

 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ 
 #include <toolkit/helper/vclunohelper.hxx>
 #endif
-#ifndef _SV_WINTYPES_HXX
-#include <vcl/wintypes.hxx>
-#endif
+#include <tools/wintypes.hxx>
 #ifndef _SV_SVAPP_HXX 
 #include <vcl/svapp.hxx>
 #endif

binfilter/bf_sc/source/core/data/sc_attarray.cxx

 /*N*/     short   nIndex = 0;
 /*N*/     USHORT  nThisRow = 0;
 /*N*/ 
-/*N*/     while ( nThisRow <= MAXROW )
+/*N*/     while ( nThisRow <= MAXROW && nIndex < nCount )
 /*N*/ 	{
 /*N*/         const ScPatternAttr* pOldPattern = pData[nIndex].pPattern;
 /*N*/         const SfxPoolItem* pItem;

binfilter/bf_sc/source/ui/docshell/sc_docsh3.cxx

 /*N*/ 
 /*N*/ 	// zweistellige Jahreszahleneingabe aus Extras->Optionen->Allgemein->Sonstiges
 /*N*/ 	aDocOpt.SetYear2000( SFX_APP()->GetMiscConfig()->GetYear2000() );
+        aDocOpt.SetStdPrecision( 2 );   // #i114730# use sdc-compatible value of 2 if not overridden in file
 /*N*/ 
 /*N*/ 	aDocument.SetDocOptions( aDocOpt );
 /*N*/ 	aDocument.SetViewOptions( aViewOpt );

binfilter/bf_sc/source/ui/inc/ui_pch.hxx

 #include <vcl/outdev.hxx>
 #include <vcl/pointr.hxx>
 #include <vcl/ptrstyle.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include <vcl/event.hxx>
 #include <limits.h>
 #include <tools/errinf.hxx>
 #include <scresid.hxx>
 #include <docsh.hxx>
 #include <bf_sfx2/interno.hxx>
-#include <vcl/wintypes.hxx>
 #include <bf_sfx2/docfac.hxx>
 #include <scitems.hxx>
 #include <vcl/virdev.hxx>

binfilter/bf_sch/source/ui/inc/globopt.hxx

 #ifndef _SCH_GLOBOPT_HXX
 #define _SCH_GLOBOPT_HXX
 
-#ifndef _VCL_FLDUNIT_HXX
-#include <vcl/fldunit.hxx>
-#endif
+#include <tools/fldunit.hxx>
 namespace binfilter {
 
 namespace sch

binfilter/bf_svtools/source/misc/svt_ehdl.cxx

 #ifndef _TOOLS_RCID_H //autogen
 #include <tools/rcid.h>
 #endif
-#ifndef _SV_WINTYPES_HXX //autogen
-#include <vcl/wintypes.hxx>
-#endif
+#include <tools/wintypes.hxx>
 #ifndef _SV_MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif

binfilter/bf_svx/source/unodraw/svx_unoprov.cxx

 #include <com/sun/star/util/MeasureUnit.hpp>
 #endif
 
-#ifndef _VCL_FLDUNIT_HXX
-#include <vcl/fldunit.hxx>
-#endif
+#include <tools/fldunit.hxx>
 
 #ifndef _SHL_HXX 
 #include <tools/shl.hxx>

binfilter/bf_sw/source/filter/xml/sw_xmliteme.cxx

 #include <bf_svx/unomid.hxx>
 #endif
 
-#ifndef _VCL_FLDUNIT_HXX
-#include <vcl/fldunit.hxx>
-#endif
+#include <tools/fldunit.hxx>
 
 #ifndef _SWMODULE_HXX //autogen wg. SW_MOD
 #include <swmodule.hxx>

binfilter/bf_sw/source/ui/inc/modcfg.hxx

 #ifndef _STRING_HXX //autogen
 #include <tools/string.hxx>
 #endif
-#ifndef _SV_WINTYPES_HXX
-#include <vcl/wintypes.hxx>
-#endif
+#include <tools/wintypes.hxx>
 #ifndef _SV_FIELD_HXX
 #include <vcl/field.hxx>
 #endif

binfilter/bf_sw/source/ui/inc/uitool.hxx

 #ifndef _UITOOL_HXX
 #define _UITOOL_HXX
 
-#ifndef _SV_WINTYPES_HXX //autogen
-#include <vcl/wintypes.hxx>
-#endif
+#include <tools/wintypes.hxx>
 #ifndef _SV_FIELD_HXX
 #include <vcl/field.hxx>
 #endif

binfilter/bf_sw/source/ui/inc/usrpref.hxx

 #endif
 #include "viewopt.hxx"
 
-#ifndef _VCL_FLDUNIT_HXX
-#include <vcl/fldunit.hxx>
-#endif
+#include <tools/fldunit.hxx>
 namespace binfilter {
 
 /* -----------------------------28.09.00 09:45--------------------------------

binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx

 
 #endif
 
-#ifndef _VCL_FLDUNIT_HXX
-#include <vcl/fldunit.hxx>
-#endif
+#include <tools/fldunit.hxx>
 
 // #110680#
 //#ifndef _COMPHELPER_PROCESSFACTORY_HXX_

binfilter/bf_xmloff/source/forms/xmloff_elementexport.cxx

 #ifndef _COM_SUN_STAR_FORM_LISTSOURCETYPE_HPP_
 #include <com/sun/star/form/ListSourceType.hpp>
 #endif
-#ifndef _SV_WINTYPES_HXX
-#include <vcl/wintypes.hxx>		// for check states
-#endif
+#include <tools/wintypes.hxx>		// for check states
 #ifndef _XMLOFF_XMLEVENTEXPORT_HXX
 #include "XMLEventExport.hxx"
 #endif

binfilter/bf_xmloff/source/forms/xmloff_formenums.cxx

 #ifndef _COM_SUN_STAR_AWT_FONTRELIEF_HPP_
 #include <com/sun/star/awt/FontRelief.hpp>
 #endif
-#ifndef _SV_WINTYPES_HXX
-#include <vcl/wintypes.hxx>		// for check states
-#endif
+#include <tools/wintypes.hxx>		// for check states
 namespace binfilter {
 
 //.........................................................................

binfilter/bf_xmloff/source/forms/xmloff_layerimport.cxx

 #ifndef _COM_SUN_STAR_FORM_LISTSOURCETYPE_HPP_
 #include <com/sun/star/form/ListSourceType.hpp>
 #endif
-#ifndef _SV_WINTYPES_HXX
-#include <vcl/wintypes.hxx>		// for check states
-#endif
+#include <tools/wintypes.hxx>		// for check states
 
 // #110680#
 //#ifndef _COMPHELPER_PROCESSFACTORY_HXX_

binfilter/inc/bf_sfx2/saveopt.hxx

 #define _SFX_SAVEOPT_HXX
 
 
-#ifndef _SV_WINTYPES_HXX //autogen
-#include <vcl/wintypes.hxx>
-#endif
+#include <tools/wintypes.hxx>
 #ifndef _SV_FIELD_HXX //autogen
 #include <vcl/field.hxx>
 #endif

binfilter/inc/bf_so3/ipenv.hxx

 #define _IPENV_HXX
 
 #include <bf_so3/client.hxx>
-#ifndef _TOOLS_VCLRSC_HXX
-#include <vcl/mapunit.hxx>
-#endif
+//#include <tools/mapunit.hxx>
 
 #ifndef INCLUDED_SO3DLLAPI_H
 #include "bf_so3/so3dllapi.h"

binfilter/inc/bf_sw/swmodule.hxx

 #ifndef _COM_SUN_STAR_LINGUISTIC2_XLINGUSERVICEEVENTLISTENER_HPP_
 #include <com/sun/star/linguistic2/XLinguServiceEventListener.hpp>
 #endif
-#ifndef _VCL_FLDUNIT_HXX
-#include <vcl/fldunit.hxx>
-#endif
+#include <tools/fldunit.hxx>
 namespace com{ namespace sun{ namespace star{ namespace scanner{
 	class XScannerManager;
 }}}}

binfilter/inc/bf_xmloff/VisAreaContext.hxx

 #include <bf_xmloff/xmlictxt.hxx>
 #endif
 
-#ifndef _VCL_MAPUNIT_HXX
-#include <vcl/mapunit.hxx>
-#endif
+#include <tools/mapunit.hxx>
 class Rectangle;
 namespace com { namespace sun { namespace star { namespace awt {
 	struct Rectangle;

binfilter/inc/bf_xmloff/styleexp.hxx

 #include <com/sun/star/uno/Reference.h>
 #endif
 
-#ifndef _VCL_MAPUNIT_HXX
-//#include <vcl/mapunit.hxx>
-#endif
-
 #ifndef _UNIVERSALL_REFERENCE_HXX
 #include <bf_xmloff/uniref.hxx>
 #endif

binfilter/inc/bf_xmloff/xmlehelp.hxx

 #ifndef _XMLOFF_XMLEHELP_HXX
 #define _XMLOFF_XMLEHELP_HXX
 
-#ifndef _VCL_MAPUNIT_HXX
-#include <vcl/mapunit.hxx>
-#endif
+#include <tools/mapunit.hxx>
 namespace rtl { class OUStringBuffer; }
 namespace binfilter {
 

binfilter/inc/bf_xmloff/xmlexp.hxx

 #ifndef _RTL_USTRING_HXX_
 #include <rtl/ustring.hxx>
 #endif
-#ifndef _VCL_MAPUNIT_HXX
-#include <vcl/mapunit.hxx>
-#endif
+#include <tools/mapunit.hxx>
 
 #ifndef _XMLOFF_TEXTPARAE_HXX_
 #include <bf_xmloff/txtparae.hxx>

binfilter/inc/bf_xmloff/xmlnume.hxx

 #ifndef _RTL_USTRING_HXX_
 #include <rtl/ustring.hxx>
 #endif
-#ifndef _VCL_MAPUNIT_HXX
-#include <vcl/mapunit.hxx>
-#endif
+#include <tools/mapunit.hxx>
 
 #ifndef _XMLOFF_ATTRLIST_HXX
 #include <bf_xmloff/attrlist.hxx>

binfilter/inc/bf_xmloff/xmluconv.hxx

 #include <tools/color.hxx>
 #endif
 
-#ifndef _VCL_MAPUNIT_HXX
-#include <vcl/mapunit.hxx>
-#endif
+#include <tools/mapunit.hxx>
 
 #ifndef _XMLOFF_XMLEMENT_HXX
 #include <bf_xmloff/xmlement.hxx>

canvas/source/vcl/backbuffer.cxx

             // switch off AA for WIN32 and UNIX, the VCLCanvas does not look good with it and
             // is not required to do AA. It would need to be adapted to use it correctly 
             // (especially gradient painting). This will need extra work.
-			maVDev->SetAntialiasing( maVDev->GetAntialiasing() & !ANTIALIASING_ENABLE_B2DDRAW);
+			maVDev->SetAntialiasing( maVDev->GetAntialiasing() & ~ANTIALIASING_ENABLE_B2DDRAW);
 #endif
         }
     }

canvas/source/vcl/bitmapbackbuffer.cxx

             // switch off AA for WIN32 and UNIX, the VCLCanvas does not look good with it and
             // is not required to do AA. It would need to be adapted to use it correctly 
             // (especially gradient painting). This will need extra work.
-			mpVDev->SetAntialiasing(mpVDev->GetAntialiasing() & !ANTIALIASING_ENABLE_B2DDRAW);
+			mpVDev->SetAntialiasing(mpVDev->GetAntialiasing() & ~ANTIALIASING_ENABLE_B2DDRAW);
 #endif
         }
     }

canvas/source/vcl/spritedevicehelper.cxx

         // switch off AA for WIN32 and UNIX, the VCLCanvas does not look good with it and
         // is not required to do AA. It would need to be adapted to use it correctly 
         // (especially gradient painting). This will need extra work.
-        mpBackBuffer->getOutDev().SetAntialiasing(mpBackBuffer->getOutDev().GetAntialiasing() & !ANTIALIASING_ENABLE_B2DDRAW);
+        mpBackBuffer->getOutDev().SetAntialiasing(mpBackBuffer->getOutDev().GetAntialiasing() & ~ANTIALIASING_ENABLE_B2DDRAW);
 #endif
     }
 

chart2/inc/pch/precompiled_chart2.hxx

 #include "unotools/configitem.hxx"
 #include "unotools/eventlisteneradapter.hxx"
 
-#include "vcl/fldunit.hxx"
+#include "tools/fldunit.hxx"
 
 #include "vos/mutex.hxx"
 //---MARKER---

chart2/source/controller/inc/ConfigurationAccess.hxx

 #define _CHART2_CONFIGURATIONACCESS_HXX
 
 // header for enum FieldUnit
-#include <vcl/fldunit.hxx>
+#include <tools/fldunit.hxx>
 
 //.............................................................................
 namespace chart

comphelper/inc/comphelper/sequenceasvector.hxx

         {}
 
         //---------------------------------------
+        /** @short  creates a new vector with the given length.
+
+            @param  nLength
+                    the number of elements for the new vector.
+         */
+        explicit SequenceAsVector(sal_Int32 nLength) :
+            ::std::vector< TElementType >( static_cast< size_t >( nLength ) )
+        {
+        }
+
+        //---------------------------------------
         /** @short  creates a new deque from the given uno sequence.
 
             @param  lSource

cppu/inc/com/sun/star/uno/Sequence.h

         
         @param len initial sequence length
     */
-    inline Sequence( sal_Int32 len );
+    inline explicit Sequence( sal_Int32 len );
     
     /** Destructor: Releases sequence handle. Last handle will destruct
         elements and free memory.

cppuhelper/inc/cppuhelper/factory.hxx

 #ifndef _CPPUHELPER_FACTORY_HXX_
 #define _CPPUHELPER_FACTORY_HXX_
 
-#ifndef _RTL_STRING_HXX_
 #include <rtl/ustring.hxx>
-#endif
 #include <uno/dispatcher.h>
 #include <rtl/unload.h>
 
     compiled it. If the environment is NOT session specific (needs no additional context),
     then this function should return the environment type name and leave ppEnv (to 0).
     
-    @paramppEnvTypeName environment type name; string must be constant
+    @param ppEnvTypeName environment type name; string must be constant
     @param ppEnv function returns its environment if the environment is session specific,
                  i.e. has special context
 */

cui/source/options/optcolor.cxx

 
     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] );
         }
     }
 }

dbaccess/source/ui/dlg/UserAdminDlg.src

 	{
 		OutputSize = TRUE ;
 		HelpId = HID_DSADMIN_TABCONTROL;
-		SingleLine=TRUE;
 	};
 	String STR_PAGETITLE_USERADMIN
 	{

dbaccess/source/ui/dlg/advancedsettings.src

     {
         OutputSize = TRUE ;
         HelpId = HID_DSADMIN_TABCONTROL;
-        SingleLine=TRUE;
     };
     
     String STR_GENERATED_VALUE

dbaccess/source/ui/dlg/dbadmin.src

 	{
 		OutputSize = TRUE ;
 		HelpId = HID_DSADMIN_TABCONTROL;
-		SingleLine=TRUE;
 	};
 
 	//.........................................................................
 	{
 		OutputSize = TRUE ;
 		HelpId = HID_DSADMIN_TABCONTROL;
-		SingleLine=TRUE;
 	};
 	Text [ en-US ] = "Database properties" ;
 };

dbaccess/source/ui/dlg/dbadminsetup.src

 	{
 		OutputSize = TRUE ;
 		HelpId = HID_DSADMIN_TABCONTROL;
-		SingleLine=TRUE;
 	};
 
 	String STR_DBWIZARDTITLE
Add a comment to this file

default_images/res/commandimagelist/lc_showannotation.png

Removed
Old image
Add a comment to this file

default_images/res/commandimagelist/lc_showannotations.png

Added
New image
Add a comment to this file

default_images/res/commandimagelist/lch_showannotation.png

Removed
Old image
Add a comment to this file

default_images/res/commandimagelist/lch_showannotations.png

Added
New image
Add a comment to this file

default_images/res/commandimagelist/sc_showannotation.png

Removed
Old image
Add a comment to this file

default_images/res/commandimagelist/sc_showannotations.png

Added
New image
Add a comment to this file

default_images/res/commandimagelist/sch_showannotation.png

Removed
Old image
Add a comment to this file

default_images/res/commandimagelist/sch_showannotations.png

Added
New image
Add a comment to this file

default_images/toolkit/source/awt/spinner03-32-hc_01.png

Removed
Old image
Add a comment to this file

default_images/toolkit/source/awt/spinner03-32-hc_02.png

Removed
Old image
Add a comment to this file

default_images/toolkit/source/awt/spinner03-32-hc_03.png

Removed
Old image
Add a comment to this file

default_images/toolkit/source/awt/spinner03-32-hc_04.png

Removed
Old image
Add a comment to this file

default_images/toolkit/source/awt/spinner03-32-hc_05.png