1. mst
  2. ooo340

Commits

Vladimir Glazunov  committed d4a8821 Merge

CWS-TOOLING: integrate CWS vcl117

  • Participants
  • Parent commits d9ff609, cf12c03
  • Branches default

Comments (0)

Files changed (239)

File accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx

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

File accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx

View file
  • Ignore whitespace
 
 #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;

File automation/source/server/statemnt.cxx

View file
  • Ignore whitespace
 #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>

File automation/source/server/statemnt.hxx

View file
  • Ignore whitespace
 #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>

File basctl/source/basicide/basicprint.src

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

File basctl/source/basicide/basicrenderable.cxx

View file
  • Ignore whitespace
 , 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 );

File basic/inc/pch/precompiled_basic.hxx

View file
  • Ignore whitespace
 #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"

File basic/source/runtime/methods.cxx

View file
  • Ignore whitespace
 #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>

File binfilter/bf_forms/source/component/forms_Filter.cxx

View file
  • Ignore whitespace
 #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

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

View file
  • Ignore whitespace
 #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>

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

View file
  • Ignore whitespace
 #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

File binfilter/bf_svtools/source/misc/svt_ehdl.cxx

View file
  • Ignore whitespace
 #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

File binfilter/bf_svx/source/unodraw/svx_unoprov.cxx

View file
  • Ignore whitespace
 #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>

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

View file
  • Ignore whitespace
 #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>

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

View file
  • Ignore whitespace
 #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

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

View file
  • Ignore whitespace
 #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

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

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

File binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx

View file
  • Ignore whitespace
 
 #endif
 
-#ifndef _VCL_FLDUNIT_HXX
-#include <vcl/fldunit.hxx>
-#endif
+#include <tools/fldunit.hxx>
 
 // #110680#
 //#ifndef _COMPHELPER_PROCESSFACTORY_HXX_

File binfilter/bf_xmloff/source/forms/xmloff_elementexport.cxx

View file
  • Ignore whitespace
 #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

File binfilter/bf_xmloff/source/forms/xmloff_formenums.cxx

View file
  • Ignore whitespace
 #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 {
 
 //.........................................................................

File binfilter/bf_xmloff/source/forms/xmloff_layerimport.cxx

View file
  • Ignore whitespace
 #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_

File binfilter/inc/bf_sfx2/saveopt.hxx

View file
  • Ignore whitespace
 #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

File binfilter/inc/bf_so3/ipenv.hxx

View file
  • Ignore whitespace
 #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"

File binfilter/inc/bf_sw/swmodule.hxx

View file
  • Ignore whitespace
 #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;
 }}}}

File binfilter/inc/bf_xmloff/VisAreaContext.hxx

View file
  • Ignore whitespace
 #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;

File binfilter/inc/bf_xmloff/styleexp.hxx

View file
  • Ignore whitespace
 #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

File binfilter/inc/bf_xmloff/xmlehelp.hxx

View file
  • Ignore whitespace
 #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 {
 

File binfilter/inc/bf_xmloff/xmlexp.hxx

View file
  • Ignore whitespace
 #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>

File binfilter/inc/bf_xmloff/xmlnume.hxx

View file
  • Ignore whitespace
 #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>

File binfilter/inc/bf_xmloff/xmluconv.hxx

View file
  • Ignore whitespace
 #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>

File canvas/source/vcl/backbuffer.cxx

View file
  • Ignore whitespace
             // 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
         }
     }

File canvas/source/vcl/bitmapbackbuffer.cxx

View file
  • Ignore whitespace
             // 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
         }
     }

File canvas/source/vcl/spritedevicehelper.cxx

View file
  • Ignore whitespace
         // 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
     }
 

File chart2/inc/pch/precompiled_chart2.hxx

View file
  • Ignore whitespace
 #include "unotools/configitem.hxx"
 #include "unotools/eventlisteneradapter.hxx"
 
-#include "vcl/fldunit.hxx"
+#include "tools/fldunit.hxx"
 
 #include "vos/mutex.hxx"
 //---MARKER---

File chart2/source/controller/inc/ConfigurationAccess.hxx

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

File cui/source/options/optcolor.cxx

View file
  • Ignore whitespace
 
     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] );
         }
     }
 }

File dbaccess/source/ui/dlg/UserAdminDlg.src

View file
  • Ignore whitespace
 	{
 		OutputSize = TRUE ;
 		HelpId = HID_DSADMIN_TABCONTROL;
-		SingleLine=TRUE;
 	};
 	String STR_PAGETITLE_USERADMIN
 	{

File dbaccess/source/ui/dlg/advancedsettings.src

View file
  • Ignore whitespace
     {
         OutputSize = TRUE ;
         HelpId = HID_DSADMIN_TABCONTROL;
-        SingleLine=TRUE;
     };
     
     String STR_GENERATED_VALUE

File dbaccess/source/ui/dlg/dbadmin.src

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

File dbaccess/source/ui/dlg/dbadminsetup.src

View file
  • Ignore whitespace
 	{
 		OutputSize = TRUE ;
 		HelpId = HID_DSADMIN_TABCONTROL;
-		SingleLine=TRUE;
 	};
 
 	String STR_DBWIZARDTITLE

File desktop/inc/app.hxx

View file
  • Ignore whitespace
 {
     friend class UserInstall;
 
+    void doShutdown();
+
 	public:
 		enum BootstrapError
 		{
 		virtual USHORT			Exception(USHORT nError);
 		virtual void			SystemSettingsChanging( AllSettings& rSettings, Window* pFrame );
 		virtual void			AppEvent( const ApplicationEvent& rAppEvent );
-
+		
 		DECL_LINK(          OpenClients_Impl, void* );
 
 		static void				OpenClients();

File desktop/source/app/app.cxx

View file
  • Ignore whitespace
     HandleAppEvent( rAppEvent );
 }
 
+struct ExecuteGlobals
+{
+	Reference < css::document::XEventListener > xGlobalBroadcaster;
+	sal_Bool bRestartRequested;
+	sal_Bool bUseSystemFileDialog;
+	std::auto_ptr<SvtLanguageOptions> pLanguageOptions;
+    std::auto_ptr<SvtPathOptions> pPathOptions;
+
+    ExecuteGlobals()
+    : bRestartRequested( sal_False )
+    , bUseSystemFileDialog( sal_True )
+    {}	
+};
+
+static ExecuteGlobals* pExecGlobals = NULL;
+
 void Desktop::Main()
 {
+    pExecGlobals = new ExecuteGlobals();
+    
     RTL_LOGFILE_CONTEXT( aLog, "desktop (cd100003) ::Desktop::Main" );
 
     // Remember current context object
     Reference< XMultiServiceFactory > xSMgr =
         ::comphelper::getProcessServiceFactory();
 
-    std::auto_ptr<SvtLanguageOptions> pLanguageOptions;
-    std::auto_ptr<SvtPathOptions> pPathOptions;
-
     Reference< ::com::sun::star::task::XRestartManager > xRestartManager;
-    sal_Bool bRestartRequested( sal_False );
-    sal_Bool bUseSystemFileDialog(sal_True);
     int         nAcquireCount( 0 );
-    Reference < css::document::XEventListener > xGlobalBroadcaster;
     try
     {
         RegisterServices( xSMgr );
 
         SetDisplayName( aTitle );
         RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ create SvtPathOptions and SvtLanguageOptions" );
-        pPathOptions.reset( new SvtPathOptions);
+        pExecGlobals->pPathOptions.reset( new SvtPathOptions);
         SetSplashScreenProgress(40);
         RTL_LOGFILE_CONTEXT_TRACE( aLog, "} create SvtPathOptions and SvtLanguageOptions" );
 
             SvtPathOptions().SetWorkPath( aWorkPath );
         }
 
-        // create service for loadin SFX (still needed in startup)
-        xGlobalBroadcaster = Reference < css::document::XEventListener >
-            ( xSMgr->createInstance(
+	    // create service for loadin SFX (still needed in startup)
+        pExecGlobals->xGlobalBroadcaster = Reference < css::document::XEventListener >
+			( xSMgr->createInstance(
             DEFINE_CONST_UNICODE( "com.sun.star.frame.GlobalEventBroadcaster" ) ), UNO_QUERY );
 
         /* ensure existance of a default window that messages can be dispatched to
             RTL_LOGFILE_CONTEXT_TRACE( aLog, "} FirstStartWizard" );
         }
 
-        // keep a language options instance...
-        pLanguageOptions.reset( new SvtLanguageOptions(sal_True));
-
-        if (xGlobalBroadcaster.is())
+		// keep a language options instance...
+		pExecGlobals->pLanguageOptions.reset( new SvtLanguageOptions(sal_True));
+
+        if (pExecGlobals->xGlobalBroadcaster.is())
         {
             css::document::EventObject aEvent;
             aEvent.EventName = ::rtl::OUString::createFromAscii("OnStartApp");
-            xGlobalBroadcaster->notifyEvent(aEvent);
+            pExecGlobals->xGlobalBroadcaster->notifyEvent(aEvent);
         }
 
         SetSplashScreenProgress(50);
             xRestartManager.set( aContext.getSingleton( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.task.OfficeRestartManager" ) ) ), UNO_QUERY );
         }
 
-        // check whether the shutdown is caused by restart
-        bRestartRequested = ( xRestartManager.is() && xRestartManager->isRestartRequested( sal_True ) );
-
-        if ( pCmdLineArgs->IsHeadless() )
-        {
-            // Ensure that we use not the system file dialogs as
-            // headless mode relies on Application::EnableHeadlessMode()
-            // which does only work for VCL dialogs!!
-            SvtMiscOptions aMiscOptions;
-            bUseSystemFileDialog = aMiscOptions.UseSystemFileDialog();
-            aMiscOptions.SetUseSystemFileDialog( sal_False );
-        }
-
-        if ( !bRestartRequested )
+		// check whether the shutdown is caused by restart
+		pExecGlobals->bRestartRequested = ( xRestartManager.is() && xRestartManager->isRestartRequested( sal_True ) );
+
+		if ( pCmdLineArgs->IsHeadless() )
+		{
+			// Ensure that we use not the system file dialogs as
+			// headless mode relies on Application::EnableHeadlessMode()
+			// which does only work for VCL dialogs!!
+			SvtMiscOptions aMiscOptions;
+			pExecGlobals->bUseSystemFileDialog = aMiscOptions.UseSystemFileDialog();
+			aMiscOptions.SetUseSystemFileDialog( sal_False );
+		}
+
+        if ( !pExecGlobals->bRestartRequested )
         {
             if ((!pCmdLineArgs->WantsToLoadDocument()                                  ) &&
                 (SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::E_SSTARTMODULE)) &&
     SvtAccessibilityOptions aOptions;
     aOptions.SetVCLSettings();
 
-    if ( !bRestartRequested )
-    {
-        Application::SetFilterHdl( LINK( this, Desktop, ImplInitFilterHdl ) );
-
+    if ( !pExecGlobals->bRestartRequested )
+	{
+		Application::SetFilterHdl( LINK( this, Desktop, ImplInitFilterHdl ) );
         sal_Bool bTerminateRequested = sal_False;
 
         // Preload function depends on an initialized sfx application!
                 new svt::JavaContext( com::sun::star::uno::getCurrentContext() ) );
 
             // check whether the shutdown is caused by restart just before entering the Execute
-            bRestartRequested = bRestartRequested || ( xRestartManager.is() && xRestartManager->isRestartRequested( sal_True ) );
-
-            if ( !bRestartRequested )
+            pExecGlobals->bRestartRequested = pExecGlobals->bRestartRequested || ( xRestartManager.is() && xRestartManager->isRestartRequested( sal_True ) );
+
+            if ( !pExecGlobals->bRestartRequested )
             {
                 // if this run of the office is triggered by restart, some additional actions should be done
                 DoRestartActionsIfNecessary( !pCmdLineArgs->IsInvisible() && !pCmdLineArgs->IsNoQuickstart() );
 
                 Execute();
             }
-        }
-        catch(const com::sun::star::document::CorruptedFilterConfigurationException& exFilterCfg)
-        {
-            OfficeIPCThread::SetDowning();
-            FatalError( MakeStartupErrorMessage(exFilterCfg.Message) );
-        }
-        catch(const com::sun::star::configuration::CorruptedConfigurationException& exAnyCfg)
-        {
-            OfficeIPCThread::SetDowning();
-            FatalError( MakeStartupErrorMessage(exAnyCfg.Message) );
-        }
-    }
+		}
+		catch(const com::sun::star::document::CorruptedFilterConfigurationException& exFilterCfg)
+		{
+			OfficeIPCThread::SetDowning();
+			FatalError( MakeStartupErrorMessage(exFilterCfg.Message) );
+		}
+		catch(const com::sun::star::configuration::CorruptedConfigurationException& exAnyCfg)
+		{
+			OfficeIPCThread::SetDowning();
+			FatalError( MakeStartupErrorMessage(exAnyCfg.Message) );
+		}
+	}
+	// CAUTION: you do not necessarily get here e.g. on the Mac.
+	// please put all deinitialization code into doShutdown
+	doShutdown();
+}
+
+void Desktop::doShutdown()
+{
+    if( ! pExecGlobals )
+        return;
     
-    if ( bRestartRequested )
+    if ( pExecGlobals->bRestartRequested )
         SetRestartState();
 
-    if (xGlobalBroadcaster.is())
+	if (pExecGlobals->xGlobalBroadcaster.is())
     {
         css::document::EventObject aEvent;
         aEvent.EventName = ::rtl::OUString::createFromAscii("OnCloseApp");
-        xGlobalBroadcaster->notifyEvent(aEvent);
+        pExecGlobals->xGlobalBroadcaster->notifyEvent(aEvent);
     }
 
-    delete pResMgr;
+	delete pResMgr, pResMgr = NULL;
     // Restore old value
+    CommandLineArgs* pCmdLineArgs = GetCommandLineArgs();
     if ( pCmdLineArgs->IsHeadless() )
-        SvtMiscOptions().SetUseSystemFileDialog( bUseSystemFileDialog );
+        SvtMiscOptions().SetUseSystemFileDialog( pExecGlobals->bUseSystemFileDialog );
 
     // remove temp directory
     RemoveTemporaryDirectory();
     FlushConfiguration();
     // The acceptors in the AcceptorMap must be released (in DeregisterServices)
     // with the solar mutex unlocked, to avoid deadlock:
-    nAcquireCount = Application::ReleaseSolarMutex();
+    ULONG nAcquireCount = Application::ReleaseSolarMutex();
     DeregisterServices();
     Application::AcquireSolarMutex(nAcquireCount);
     tools::DeInitTestToolLib();
     // be sure that path/language options gets destroyed before
     // UCB is deinitialized
     RTL_LOGFILE_CONTEXT_TRACE( aLog, "-> dispose path/language options" );
-    pLanguageOptions.reset( 0 );
-    pPathOptions.reset( 0 );
+    pExecGlobals->pLanguageOptions.reset( 0 );
+    pExecGlobals->pPathOptions.reset( 0 );
     RTL_LOGFILE_CONTEXT_TRACE( aLog, "<- dispose path/language options" );
 
     RTL_LOGFILE_CONTEXT_TRACE( aLog, "-> deinit ucb" );
     ::ucbhelper::ContentBroker::deinitialize();
     RTL_LOGFILE_CONTEXT_TRACE( aLog, "<- deinit ucb" );
+    
+    sal_Bool bRR = pExecGlobals->bRestartRequested;
+    delete pExecGlobals, pExecGlobals = NULL;
 
     RTL_LOGFILE_CONTEXT_TRACE( aLog, "FINISHED WITH Destop::Main" );
-    if ( bRestartRequested )
+    if ( bRR )
     {
         restartOnMac(true);
         // wouldn't the solution be more clean if SalMain returns the exit code to the system?
         // unfortunately this broke the QUARTZ behavior which is to always run
         // in quickstart mode since Mac applications do not usually quit
         // when the last document closes
-        #ifndef QUARTZ
+        //#ifndef QUARTZ
         if ( bQuickstart )
-        #endif
+        //#endif
         {
             Reference < XComponent > xQuickstart( rSMgr->createInstanceWithArguments(
                                                 DEFINE_CONST_UNICODE( "com.sun.star.office.Quickstart" ), aSeq ),
     }
     hStyleSettings.SetUseImagesInMenus(bUseImagesInMenus);
 
-    sal_uInt16 nTabStyle = hStyleSettings.GetTabControlStyle();
-    nTabStyle &= ~STYLE_TABCONTROL_SINGLELINE;
-    if( aAppearanceCfg.IsSingleLineTabCtrl() )
-        nTabStyle |=STYLE_TABCONTROL_SINGLELINE;
-
-    nTabStyle &= ~STYLE_TABCONTROL_COLOR;
-    if( aAppearanceCfg.IsColoredTabCtrl() )
-        nTabStyle |= STYLE_TABCONTROL_COLOR;
-
-    hStyleSettings.SetTabControlStyle(nTabStyle);
-
-    hStyleSettings.SetDragFullOptions( nDragFullOptions );
-    rSettings.SetStyleSettings ( hStyleSettings );
+	hStyleSettings.SetDragFullOptions( nDragFullOptions );
+	rSettings.SetStyleSettings ( hStyleSettings );
 }
 
 // ========================================================================
         catch(const css::uno::Exception&)
         {}
     }
+    else if( rAppEvent.GetEvent() == "PRIVATE:DOSHUTDOWN" )
+    {
+        Desktop* pD = dynamic_cast<Desktop*>(GetpApp());
+        OSL_ENSURE( pD, "no desktop ?!?" );
+        if( pD )
+            pD->doShutdown();
+    }
 }
 
 void Desktop::OpenSplashScreen()

File drawinglayer/source/processor2d/vclhelperbitmaprender.cxx

View file
  • Ignore whitespace
 			aOutlineRange.transform(aSimpleObjectMatrix);
 		}
 
-		// prepare dest coor
-		const sal_uInt32 nDiscreteWidth(basegfx::fround(aOutlineRange.getMaxX()));
-		const sal_uInt32 nDiscreteHeight(basegfx::fround(aOutlineRange.getMaxY()));
-		const Rectangle aDestRectPixel(
-			basegfx::fround(aOutlineRange.getMinX()), 
-			basegfx::fround(aOutlineRange.getMinY()),
-			nDiscreteWidth > 0 ? nDiscreteWidth - 1 : 0,
-			nDiscreteHeight > 0 ? nDiscreteHeight - 1 : 0);
+		// prepare dest coordinates
+		const Point	aPoint(
+                basegfx::fround(aOutlineRange.getMinX()), 
+                basegfx::fround(aOutlineRange.getMinY()));
+        const Size aSize(
+                basegfx::fround(aOutlineRange.getWidth()),
+                basegfx::fround(aOutlineRange.getHeight()));
 
 		// paint it using GraphicManager
 		Graphic aGraphic(rBitmapEx);
 		GraphicObject aGraphicObject(aGraphic);
-		aGraphicObject.Draw(&rOutDev, aDestRectPixel.TopLeft(), aDestRectPixel.GetSize(), &aAttributes);
+		aGraphicObject.Draw(&rOutDev, aPoint, aSize, &aAttributes);
 	}
 
 	void RenderBitmapPrimitive2D_BitmapEx(
 		// prepare dest coor. Necessary to expand since vcl's DrawBitmapEx draws one pix less
 		basegfx::B2DRange aOutlineRange(0.0, 0.0, 1.0, 1.0);
 		aOutlineRange.transform(rTransform);
-		const sal_uInt32 nDiscreteWidth(basegfx::fround(aOutlineRange.getMaxX()));
-		const sal_uInt32 nDiscreteHeight(basegfx::fround(aOutlineRange.getMaxY()));
-		const Rectangle aDestRectPixel(
-			basegfx::fround(aOutlineRange.getMinX()), 
-			basegfx::fround(aOutlineRange.getMinY()),
-			nDiscreteWidth > 0 ? nDiscreteWidth - 1 : 0,
-			nDiscreteHeight > 0 ? nDiscreteHeight - 1 : 0);
+		// prepare dest coordinates
+		const Point	aPoint(
+                basegfx::fround(aOutlineRange.getMinX()), 
+                basegfx::fround(aOutlineRange.getMinY()));
+        const Size aSize(
+                basegfx::fround(aOutlineRange.getWidth()),
+                basegfx::fround(aOutlineRange.getHeight()));
 
 		// decompose matrix to check for shear, rotate and mirroring
 		basegfx::B2DVector aScale, aTranslate;
 		}
 
 		// draw bitmap
-		rOutDev.DrawBitmapEx(aDestRectPixel.TopLeft(), aDestRectPixel.GetSize(), aContent);
+		rOutDev.DrawBitmapEx(aPoint, aSize, aContent);
 	}
 
 	void RenderBitmapPrimitive2D_self(
 		// process self with free transformation (containing shear and rotate). Get dest rect in pixels.
 		basegfx::B2DRange aOutlineRange(0.0, 0.0, 1.0, 1.0);
 		aOutlineRange.transform(rTransform);
-		const sal_uInt32 nDiscreteWidth(basegfx::fround(aOutlineRange.getMaxX()));
-		const sal_uInt32 nDiscreteHeight(basegfx::fround(aOutlineRange.getMaxY()));
 		const Rectangle aDestRectLogic(
 			basegfx::fround(aOutlineRange.getMinX()), 
 			basegfx::fround(aOutlineRange.getMinY()),
-			nDiscreteWidth > 0 ? nDiscreteWidth - 1 : 0,
-			nDiscreteHeight > 0 ? nDiscreteHeight - 1 : 0);
+			basegfx::fround(aOutlineRange.getMaxX()),
+			basegfx::fround(aOutlineRange.getMaxY()));
 		const Rectangle aDestRectPixel(rOutDev.LogicToPixel(aDestRectLogic));
 
 		// #i96708# check if Metafile is recorded

File editeng/inc/pch/precompiled_editeng.hxx

View file
  • Ignore whitespace
 #include "vcl/cursor.hxx"
 #include "vcl/decoview.hxx"
 #include "vcl/dndhelp.hxx"
-#include "vcl/fldunit.hxx"
+#include "tools/fldunit.hxx"
 #include "vcl/fntstyle.hxx"
 #include "unotools/fontcvt.hxx"
 #include "vcl/gdimtf.hxx"
 #include "vcl/unohelp.hxx"
 #include "vcl/unohelp2.hxx"
 #include "vcl/wall.hxx"
-#include "vcl/wintypes.hxx"
+#include "tools/wintypes.hxx"
 #include "vos/mutex.hxx"
 #include "vos/ref.hxx"
 #include "vos/refernce.hxx"

File extensions/inc/pch/precompiled_extensions.hxx

View file
  • Ignore whitespace
 #include "unotools/processfactory.hxx"
 
 
-#include "vcl/fldunit.hxx"
+#include "tools/fldunit.hxx"
 
 #include "vos/conditn.hxx"
 #include "vos/diagnose.hxx"

File extensions/source/propctrlr/formcomponenthandler.hxx

View file
  • Ignore whitespace
 #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>
 

File forms/inc/pch/precompiled_forms.hxx

View file
  • Ignore whitespace
 #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"

File forms/source/component/Edit.cxx

View file
  • Ignore whitespace
 #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>

File forms/source/component/Filter.cxx

View file
  • Ignore whitespace
 #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()

File forms/source/component/FormattedField.cxx

View file
  • Ignore whitespace
 #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>

File forms/source/richtext/richtextcontrol.hxx

View file
  • Ignore whitespace
 #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"
 

File forms/source/richtext/richtextengine.cxx

View file
  • Ignore whitespace
 #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>

File forms/source/richtext/richtextimplcontrol.cxx

View file
  • Ignore whitespace
 #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>
 

File forms/source/richtext/rtattributehandler.cxx

View file
  • Ignore whitespace
 #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>
 

File forms/source/solar/component/navbarcontrol.hxx

View file
  • Ignore whitespace
 #include <toolkit/awt/vclxwindow.hxx>
 #include <comphelper/uno3.hxx>
 #include <cppuhelper/implbase1.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 
 //.........................................................................
 namespace frm

File fpicker/source/office/OfficeFilePicker.hxx

View file
  • Ignore whitespace
 #endif
 
 
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include "commonpicker.hxx"
 #include "pickercallbacks.hxx"
 

File framework/inc/pch/precompiled_framework.hxx

View file
  • Ignore whitespace
 #include "vcl/keycod.hxx"
 #include "vcl/keycodes.hxx"
 #include "vcl/lstbox.hxx"
-#include "vcl/mapunit.hxx"
+#include "tools/mapunit.hxx"
 #include "vcl/menu.hxx"
 #include "vcl/mnemonic.hxx"
 #include "vcl/morebtn.hxx"
 #include "vcl/timer.hxx"
 #include "vcl/wall.hxx"
 #include "vcl/window.hxx"
-#include "vcl/wintypes.hxx"
+#include "tools/wintypes.hxx"
 
 #include "vos/mutex.hxx"
 #include "vos/process.hxx"

File framework/inc/services/layoutmanager.hxx

View file
  • Ignore whitespace
 #include <cppuhelper/implbase8.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <comphelper/propertycontainer.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include <svtools/miscopt.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/timer.hxx>

File framework/source/helper/tagwindowasmodified.cxx

View file
  • Ignore whitespace
 #include <vcl/syswin.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 
 //_________________________________________________________________________________________________________________
 //	namespace

File framework/source/uielement/fontsizemenucontroller.cxx

View file
  • Ignore whitespace
 #ifndef _VCL_MENU_HXX_
 #include <vcl/menu.hxx>
 #endif
-#include <vcl/mapunit.hxx>
+#include <tools/mapunit.hxx>
 #ifndef _VCL_SVAPP_HXX_
 #include <vcl/svapp.hxx>
 #endif

File helpcontent2/source/text/shared/01/01130000.xhp

View file
  • Ignore whitespace
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/.uno:Print" id="bm_id1076258" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:Print" id="bm_id3147273" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:OK" id="bm_id0818200912034231" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:OK" id="bm_id0818200912034231" localize="false"/>
 
 <bookmark xml-lang="en-US" branch="hid/HID_PRINTDLG" id="bm_id081820090410118" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3154621" role="heading" level="1" l10n="U" oldref="1">Print</paragraph>
 <paragraph xml-lang="en-US" id="par_id081820091228505" role="paragraph" l10n="NEW">The preview shows how each sheet of paper will look. You can browse through all sheets of paper with the buttons below the preview.</paragraph><comment>insert controls with hidden help here</comment>
 <paragraph xml-lang="en-US" id="hd_id0818200912285056" role="heading" level="2" l10n="NEW">General</paragraph>
 <paragraph xml-lang="en-US" id="par_id0818200912285064" role="paragraph" l10n="NEW">On the General tab page, you find the most important control elements for printing. You can define which contents of your document are to be printed. You can select the printer and open the printer settings dialog.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_LISTBOX_DLG_SVT_PRNDLG_PRINTDLG_LB_NAMES" id="bm_id3147143" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:JobPage:PrinterList" id="bm_id3147144" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id3149511" role="paragraph" l10n="CHG" oldref="4"><ahelp hid=".">The list box shows the installed printers. Click the printer to use for the current print job. Click the Printer details button to see some information about the selected printer. Click the Properties button to change some of the printer properties.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:JobPage:Properties" id="bm_id3150693" localize="false"/>
+
+
+
+<comment>Writer:</comment>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PrintPageBackground:CheckBox" id="bm_id1" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id2" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies whether to print colors and objects that are inserted to the background of the page (Format - Page - Background).</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PrintPicturesAndObjects:CheckBox" id="bm_id3" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id4" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies whether the graphics and drawings or OLE objects of your text document are printed.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PrintHiddenText:CheckBox" id="bm_id5" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id6" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enable this option to print text that is marked as hidden.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PrintTextPlaceholder:CheckBox" id="bm_id7" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id8" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enable this option to print text placeholders. Disable this option to leave the text placeholders blank in the printout.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PrintControls:CheckBox" id="bm_id9" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id10" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies whether the form control fields of the text document are printed.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PrintBlackFonts:CheckBox" id="bm_id11" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id12" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies whether to always print text in black.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PrintEmptyPages:CheckBox" id="bm_id13" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id14" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">If this option is enabled automatically inserted blank pages are printed. This is best if you are printing double-sided. For example, in a book, a "chapter" paragraph style has been set to always start with an odd numbered page. If the previous chapter ends on an odd page, %PRODUCTNAME inserts an even numbered blank page. This option controls whether to print that even numbered page.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PrintAnnotationMode:FixedText" id="bm_id15" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id16" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Specify where to print comments (if any).</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PrintAnnotationMode:ListBox" id="bm_id17" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id18" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">"Specify where to print comments (if any)."</ahelp></paragraph>
+
+
+<comment>Math:</comment>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:TitleRow:CheckBox" id="bm_id19" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id20" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies whether you want the name of the document to be included in the printout.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:FormulaText:CheckBox" id="bm_id21" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id22" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies whether to include the contents of the Commands window at the bottom of the printout.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:Border:CheckBox" id="bm_id23" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id24" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Applies a thin border to the formula area in the printout.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PrintFormat:RadioButton:0" id="bm_id25" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id26" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Prints the formula without adjusting the current font size.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PrintFormat:RadioButton:1" id="bm_id27" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id28" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Adjusts the formula to the page format used in the printout.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PrintFormat:RadioButton:2" id="bm_id29" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id30" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Reduces or enlarges the size of the printed formula by a specified factor.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PrintScale:NumericField" id="bm_id31" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id32" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Reduces or enlarges the size of the printed formula by a specified factor.</ahelp></paragraph>
+
+
+<comment>Calc:</comment>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:IsIncludeEmptyPages:CheckBox" id="bm_id33" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id34" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">If checked empty pages that have no cell contents or draw objects are not printed.</ahelp></paragraph>
+
+
+
+<comment>Draw: would be the same as IMPRESS, but we cannot have the same Help ID twice in the same Help file. Even when switched this is not allowed because Help is compiled at compile time, while the appl switch gets evaluated only on run time.
+Moved all DRAW and IMPRESS to default section.</comment>
+<comment>BasicIDE: I doubt if we have a BASIC switch at all, so I moved the two IDs to default part. There they clashed with general IDs, so I removed them. Default text will be shown for BASIC IDE printing.</comment>
+
+<comment>General and Basic and Draw and Impress (at end of default case)</comment>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PrintPaperFromSetup:CheckBox" id="bm_id35" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id36" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">For printers with multiple trays this option specifies whether the paper tray used is specified by the system settings of the printer.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PrintContent:RadioButton:0" id="bm_id3149957" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3149164" role="paragraph" l10n="U" oldref="25"><ahelp hid="." visibility="hidden">Prints the entire document.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PrintContent:RadioButton:1" id="bm_id3148924" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3152944" role="paragraph" l10n="CHG" oldref="27"><ahelp hid="." visibility="hidden">Prints only the pages or slides that you specify in the <emph>Pages</emph> box.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PrintContent:RadioButton:2" id="bm_id3149902" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3150244" role="paragraph" l10n="U" oldref="30"><ahelp hid="." visibility="hidden">Prints only the selected area(s) or object(s) in the current document.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PageRange:Edit" id="bm_id0818200903284799" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3146848" role="paragraph" l10n="U" oldref="28"><ahelp hid="." visibility="hidden">To print a range of pages, use a format like 3-6. To print single pages, use a format like 7;9;11. You can print a combination of page ranges and single pages, by using a format like 3-6;8;10;12.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:OptPage:ToFile" id="bm_id3156955A" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3150772" role="paragraph" l10n="CHG" oldref="18"><ahelp hid="." visibility="hidden">Prints to a file instead of to a printer.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:OptPage:SingleJobs" id="bm_id37" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id38" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Check to not rely on the printer to create collated copies but create a print job for each copy instead.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:OptPage:ToReverse" id="bm_id39" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id40" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Check to print pages in reverse order.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:JobPage:Copies" id="bm_id3154347" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3145069" role="paragraph" l10n="U" oldref="34"><ahelp hid="." visibility="hidden">Enter the number of copies that you want to print.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:JobPage:Collate" id="bm_id3148663" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3150865" role="paragraph" l10n="U" oldref="36"><ahelp hid="." visibility="hidden">Preserves the page order of the original document.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:JobPage:Properties" id="bm_id3150693" localize="false"/>
 <paragraph xml-lang="en-US" id="par_id3156113" role="paragraph" l10n="CHG" oldref="16"><ahelp hid="." visibility="hidden">Opens the printer properties dialog. The printer properties vary according to the printer that you select.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svtools_RadioButton_DLG_SVT_PRNDLG_PRINTDLG_RBT_ALL_SHEETS" id="bm_id5816827" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id0909200810043691" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enables all sheets to be printed. In the "Print range" area of the dialog, you can restrict this output to some given pages.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svtools_RadioButton_DLG_SVT_PRNDLG_PRINTDLG_RBT_SELECTED_SHEETS" id="bm_id6644489" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id0909200810043626" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enables the selected sheets to be printed. In the "Print range" area of the dialog, you can restrict this output to some given pages.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svtools_RadioButton_DLG_SVT_PRNDLG_PRINTDLG_RBT_SELECTED_CELLS" id="bm_id8608966" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id0909200810043615" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enables the selected cells to be printed. In the "Print range" area of the dialog, you can restrict this output to some given pages.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sd_ListBox_DLG_PRINTDIALOG_CB_CONTENT" id="bm_id939054" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id0909200810043658" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select whether you want to print Slides, Handouts, Notes, or Outline.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sd_ListBox_DLG_PRINTDIALOG_CB_SLIDESPERPAGE" id="bm_id6802270" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id0909200810043717" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">For handouts, select the number of slides to print per page of paper.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sd_RadioButton_DLG_PRINTDIALOG_RBT_HORIZONTAL" id="bm_id7987914" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id0909200810043777" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">For handouts, enable to print in a horizontal order first.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sd_RadioButton_DLG_PRINTDIALOG_RBT_VERTICAL" id="bm_id939359" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id0909200810043750" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">For handouts, enable to print in a vertical order first.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_RADIOBUTTON_DLG_SVT_PRNDLG_PRINTDLG_RBT_ALL" id="bm_id3149956" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintContent:RadioButton:0" id="bm_id3149957" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id3149164" role="paragraph" l10n="U" oldref="25"><ahelp hid="." visibility="hidden">Prints the entire document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintContent:RadioButton:1" id="bm_id3148924" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id3152944" role="paragraph" l10n="U" oldref="27"><ahelp hid="." visibility="hidden">Prints only the pages that you specify in the <emph>Pages</emph> box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_EDIT_DLG_SVT_PRNDLG_PRINTDLG_EDT_PAGES" id="bm_id3155629" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PageRange:Edit" id="bm_id0818200903284799" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id3146848" role="paragraph" l10n="U" oldref="28"><ahelp hid=".">To print a range of pages, use a format like 3-6. To print single pages, use a format like 7;9;11. You can print a combination of page ranges and single pages, by using a format like 3-6;8;10;12.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintContent:RadioButton:2" id="bm_id3149902" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id3150244" role="paragraph" l10n="U" oldref="30"><ahelp hid="." visibility="hidden">Prints only the selected area(s) or object(s) in the current document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:JobPage:Copies" id="bm_id3154347" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id3145069" role="paragraph" l10n="U" oldref="34"><ahelp hid="." visibility="hidden">Enter the number of copies that you want to print.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:JobPage:Collate" id="bm_id3148663" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id3150865" role="paragraph" l10n="U" oldref="36"><ahelp hid="." visibility="hidden">Preserves the page order of the original document.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:JobPage:DetailsBtn" id="bm_id41" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id42" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Show/Hide detailed information of the selected printer.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:JobPage:PrinterList" id="bm_id3147144" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3149511" role="paragraph" l10n="CHG" oldref="4"><ahelp hid="." visibility="hidden">The list box shows the installed printers. Click the printer to use for the current print job. Click the Printer details button to see some information about the selected printer. Click the Properties button to change some of the printer properties.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PrintLeftRightPages:ListBox" id="bm_id43" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id44" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Specify which pages to include in the output.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PrintProspect:CheckBox" id="bm_id45" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id46" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select the Brochure option to print the document in brochure format.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PrintProspectInclude:ListBox" id="bm_id47" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id48" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select which pages of a brochure to print.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PrintProspectRTL:ListBox" id="bm_id0818200903241442" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0818200904102910" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">For brochure printing, you can select a left-to-right order of pages or a right-to-left order.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:NUpPage:BorderBox" id="bm_id49" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id50" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Check to draw a border around each page.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:NUpPage:OrderBox" id="bm_id51" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id52" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select order in which pages are to be printed.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:NUpPage:OrientationBox" id="bm_id53" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id54" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select the orientation of the paper.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:NUpPage:SheetMarginBox" id="bm_id55" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id56" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select margin between the printed pages and paper edge.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:NUpPage:PageMarginBox" id="bm_id57" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id58" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select margin between individual pages on each sheet of paper.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:NUpPage:RowsBox" id="bm_id59" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id60" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select number of rows.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:NUpPage:ColumnsBox" id="bm_id61" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id62" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select number of columns.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:NUpPage:PagesPerSheetBox" id="bm_id63" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id64" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select how many pages to print per sheet of paper.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:NUpPage:PagesPerSheet" id="bm_id65" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id66" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Print multiple pages per sheet of paper.</ahelp></paragraph>
+
+<comment>Impress:</comment>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PageContentType:ListBox" id="bm_id67" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id68" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select which parts of the document should be printed.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:SlidesPerPage:ListBox" id="bm_id69" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id70" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select how many slides to print per page.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:SlidesPerPageOrder:ListBox" id="bm_id71" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id72" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Specify how to arrange slides on the printed page.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:IsPrintName:CheckBox" id="bm_id73" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id74" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies whether to print the page name of a document.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:IsPrintDateTime:CheckBox" id="bm_id75" localize="false"/>