add lots more missing sal/macros.h includes

2010-10-14 22:33:33 +01:00 · 2010-10-14 22:33:33 +01:00 · c63d5210fd
commit c63d5210fd
parent f06fca80cd
56 changed files with 63 additions and 30 deletions
--- a/basic/source/runtime/stdobj.cxx
+++ b/basic/source/runtime/stdobj.cxx
@ -32,6 +32,7 @@
 #include "runtime.hxx"
 #include "stdobj.hxx"
 #include <basic/sbstdobj.hxx>
+#include <sal/macros.h>
 #include "rtlproto.hxx"
 #include "sbintern.hxx"
 #include <hash_map>
--- a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
+++ b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
@ -37,6 +37,7 @@
 #include "resource/sharedresources.hxx"
 #include "resource/common_res.hrc"
 #include <connectivity/dbexception.hxx>
+#include <sal/macros.h>

 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
--- a/connectivity/source/commontools/dbmetadata.cxx
+++ b/connectivity/source/commontools/dbmetadata.cxx
@ -52,6 +52,7 @@
 #include <comphelper/namedvaluecollection.hxx>
 #include <comphelper/componentcontext.hxx>
 #include <comphelper/processfactory.hxx>
+#include <sal/macros.h>

 #include <boost/optional.hpp>

--- a/connectivity/source/drivers/adabas/BDriver.cxx
+++ b/connectivity/source/drivers/adabas/BDriver.cxx
@ -29,6 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_connectivity.hxx"
 #include <unotools/tempfile.hxx>
+#include <sal/macros.h>
 #include "adabas/BDriver.hxx"
 #include "adabas/BConnection.hxx"
 #include "odbc/OFunctions.hxx"
--- a/connectivity/source/drivers/adabas/BUser.cxx
+++ b/connectivity/source/drivers/adabas/BUser.cxx
@ -28,6 +28,7 @@

 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_connectivity.hxx"
+#include <sal/macros.h>
 #include "adabas/BUser.hxx"
 #include "adabas/BGroups.hxx"
 #include <com/sun/star/sdbc/XRow.hpp>
--- a/connectivity/source/drivers/ado/Awrapado.cxx
+++ b/connectivity/source/drivers/ado/Awrapado.cxx
@ -28,6 +28,7 @@

 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_connectivity.hxx"
+#include <sal/macros.h>
 #include "ado/Awrapado.hxx"
 #include "ado/Awrapadox.hxx"
 #include <comphelper/types.hxx>
--- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
@ -28,6 +28,7 @@

 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_connectivity.hxx"
+#include <sal/macros.h>
 #include "java/sql/DatabaseMetaData.hxx"
 #include "java/sql/Connection.hxx"
 #include "java/sql/ResultSet.hxx"
--- a/connectivity/source/drivers/mozab/MColumnAlias.cxx
+++ b/connectivity/source/drivers/mozab/MColumnAlias.cxx
@ -28,6 +28,7 @@

 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_connectivity.hxx"
+#include <sal/macros.h>
 #include "MColumnAlias.hxx"
 #include "MConnection.hxx"
 #include "MExtConfigAccess.hxx"
--- a/connectivity/source/drivers/mozab/MDriver.cxx
+++ b/connectivity/source/drivers/mozab/MDriver.cxx
@ -28,6 +28,7 @@

 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_connectivity.hxx"
+#include <sal/macros.h>
 #include "MDriver.hxx"
 #include "MConnection.hxx"
 #include "connectivity/dbexception.hxx"
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@ -30,6 +30,7 @@
 #include "precompiled_connectivity.hxx"


+#include <sal/macros.h>
 #include <connectivity/sqlnode.hxx>
 #include <connectivity/sqlerror.hxx>
 #include <internalnode.hxx>
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@ -26,6 +26,7 @@
 *
 ************************************************************************/
 #include "precompiled_formula.hxx"
+#include <sal/macros.h>
 #include "formula/FormulaCompiler.hxx"
 #include "formula/errorcodes.hxx"
 #include "formula/token.hxx"
--- a/fpicker/source/office/OfficeControlAccess.cxx
+++ b/fpicker/source/office/OfficeControlAccess.cxx
@ -29,6 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_fpicker.hxx"

+#include <sal/macros.h>
 #include "OfficeControlAccess.hxx"
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@ -30,7 +30,7 @@
 #include "precompiled_fpicker.hxx"

 // includes --------------------------------------------------------------
-
+#include <sal/macros.h>
 #include "iodlg.hxx"
 #include <tools/stream.hxx>
 #include <tools/urlobj.hxx>
--- a/fpicker/source/win32/filepicker/controlaccess.cxx
+++ b/fpicker/source/win32/filepicker/controlaccess.cxx
@ -34,6 +34,7 @@
 //------------------------------------------------------------------------

 #include <tchar.h>
+#include <sal/macros.h>
 #include <osl/diagnose.h>
 #include "controlaccess.hxx"
 #include "..\misc\WinImplHelper.hxx"
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@ -34,6 +34,8 @@
 #include "classes/fwkresid.hxx"
 #include <services.h>

+#include <sal/macros.h>
+
 #include "vcl/metric.hxx"
 #include "vcl/mnemonic.hxx"
 #include "vcl/menu.hxx"
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@ -28,6 +28,7 @@

 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
+#include <sal/macros.h>
 #include <uielement/controlmenucontroller.hxx>

 //_________________________________________________________________________________________________________________
--- a/framework/source/xml/menudocumenthandler.cxx
+++ b/framework/source/xml/menudocumenthandler.cxx
@ -30,18 +30,12 @@
 #include "precompiled_framework.hxx"

 #include <stdio.h>
+#include <sal/macros.h>

-//_________________________________________________________________________________________________________________
-//  my own includes
-//_________________________________________________________________________________________________________________
 #include <xml/menudocumenthandler.hxx>
 #include <xml/menuconfiguration.hxx>
 #include <classes/addonmenu.hxx>

-//_________________________________________________________________________________________________________________
-//  interface includes
-//_________________________________________________________________________________________________________________
-
 #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
 #include <com/sun/star/lang/XSingleComponentFactory.hpp>
 #include <com/sun/star/ui/ItemType.hpp>
@ -49,16 +43,10 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>

-//_________________________________________________________________________________________________________________
-//  other includes
-//_________________________________________________________________________________________________________________
 #include <comphelper/processfactory.hxx>
 #include <rtl/logfile.hxx>
 #include <comphelper/attributelist.hxx>

-//_________________________________________________________________________________________________________________
-//  defines
-//_________________________________________________________________________________________________________________

 #define XMLNS_MENU                  "http://openoffice.org/2001/menu"
 #define XMLNS_PREFIX                "menu:"
--- a/framework/source/xml/toolboxdocumenthandler.cxx
+++ b/framework/source/xml/toolboxdocumenthandler.cxx
@ -31,28 +31,18 @@

 #include <stdio.h>

-//_________________________________________________________________________________________________________________
-//  my own includes
-//_________________________________________________________________________________________________________________
-
 #include <threadhelp/resetableguard.hxx>
 #include <xml/toolboxdocumenthandler.hxx>
 #include <macros/debug.hxx>
 #include <xml/toolboxconfigurationdefines.hxx>

-//_________________________________________________________________________________________________________________
-//  interface includes
-//_________________________________________________________________________________________________________________
 #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
 #include <com/sun/star/ui/ItemType.hpp>
 #include <com/sun/star/ui/ItemStyle.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>

-//_________________________________________________________________________________________________________________
-//  other includes
-//_________________________________________________________________________________________________________________
-
 #include <sal/config.h>
+#include <sal/macros.h>
 #include <vcl/svapp.hxx>
 #include <vcl/toolbox.hxx>
 #include <rtl/ustrbuf.hxx>
--- a/linguistic/source/gciterator.cxx
+++ b/linguistic/source/gciterator.cxx
@ -27,6 +27,7 @@
 ************************************************************************/
 #include "precompiled_linguistic.hxx"

+#include <sal/macros.h>
 #include <com/sun/star/container/XContentEnumerationAccess.hpp>
 #include <com/sun/star/container/XEnumeration.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
--- a/linguistic/source/lngopt.cxx
+++ b/linguistic/source/lngopt.cxx
@ -29,6 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_linguistic.hxx"

+#include <sal/macros.h>
 #include "lngopt.hxx"
 #include "lngprops.hxx"
 #include "misc.hxx"
--- a/linguistic/source/lngprophelp.cxx
+++ b/linguistic/source/lngprophelp.cxx
@ -30,6 +30,7 @@
 #include "precompiled_linguistic.hxx"

 #include <tools/debug.hxx>
+#include <sal/macros.h>

 #include <com/sun/star/linguistic2/LinguServiceEvent.hpp>
 #include <com/sun/star/linguistic2/LinguServiceEventFlags.hpp>
--- a/linguistic/source/misc.cxx
+++ b/linguistic/source/misc.cxx
@ -28,6 +28,7 @@

 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_linguistic.hxx"
+#include <sal/macros.h>
 #include <tools/string.hxx>
 #include <tools/fsys.hxx>
 #include <tools/debug.hxx>
--- a/linguistic/workben/sprophelp.cxx
+++ b/linguistic/workben/sprophelp.cxx
@ -29,6 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_linguistic.hxx"

+#include <sal/macros.h>
 #include "misc.hxx"

 #include "sprophelp.hxx"
--- a/scripting/source/vbaevents/eventhelper.cxx
+++ b/scripting/source/vbaevents/eventhelper.cxx
@ -31,6 +31,7 @@

 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scripting.hxx"
+#include <sal/macros.h>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/uno3.hxx>
 #include <comphelper/proparrhlp.hxx>
--- a/sfx2/source/appl/shutdowniconw32.cxx
+++ b/sfx2/source/appl/shutdowniconw32.cxx
@ -28,6 +28,7 @@

 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"
+#include <sal/macros.h>

 #ifdef WNT

--- a/sfx2/source/dialog/alienwarn.cxx
+++ b/sfx2/source/dialog/alienwarn.cxx
@ -29,6 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"

+#include <sal/macros.h>
 #include "alienwarn.hxx"
 #include "sfxresid.hxx"
 #include <sfx2/sfxuno.hxx>
--- a/sfx2/source/dialog/printopt.cxx
+++ b/sfx2/source/dialog/printopt.cxx
@ -29,6 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"

+#include <sal/macros.h>
 #include <vcl/msgbox.hxx>
 #include <unotools/printwarningoptions.hxx>
 #include <svtools/printoptions.hxx>
--- a/sfx2/source/view/frmload.cxx
+++ b/sfx2/source/view/frmload.cxx
@ -29,6 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"

+#include <sal/macros.h>
 #include "frmload.hxx"
 #include "objshimp.hxx"
 #include "viewfac.hxx"
--- a/shell/source/backends/gconfbe/gconfaccess.cxx
+++ b/shell/source/backends/gconfbe/gconfaccess.cxx
@ -27,7 +27,8 @@
 ************************************************************************/

 #include "precompiled_shell.hxx"
-#include "sal/config.h"
+#include <sal/macros.h>
+#include <sal/config.h>

 #include <string.h>

@ -37,6 +38,7 @@
 #include "osl/thread.h"
 #include "rtl/strbuf.hxx"
 #include "rtl/ustrbuf.hxx"
+#include "sal/macros.h"

 #include "gconfaccess.hxx"

--- a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx
+++ b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx
@ -35,6 +35,7 @@
 #include "internal/utilities.hxx"
 #include "internal/config.hxx"

+#include <sal/macros.h>
 #include <malloc.h>

 //----------------------------
--- a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
+++ b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
@ -37,6 +37,7 @@

 #include <propkey.h>
 #include <propvarutil.h>
+#include <sal/macros.h>

 #include <malloc.h>
 #include <strsafe.h>
--- a/shell/source/win32/shlxthandler/util/fileextensions.cxx
+++ b/shell/source/win32/shlxthandler/util/fileextensions.cxx
@ -29,6 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_shell.hxx"
 #include "internal/fileextensions.hxx"
+#include <sal/macros.h>

 //------------------------------------
 //
--- a/shell/source/win32/simplemail/senddoc.cxx
+++ b/shell/source/win32/simplemail/senddoc.cxx
@ -29,6 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_shell.hxx"
 #include <osl/diagnose.h>
+#include <sal/macros.h>

 #include "simplemapi.hxx"

--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@ -28,8 +28,10 @@

 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include <svx/dialmgr.hxx>

+#include <sal/macros.h>
+
+#include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
 #include "docrecovery.hxx"
 #include "docrecovery.hrc"
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"

-// include ---------------------------------------------------------------
+#include <sal/macros.h>
 #include <vcl/wrkwin.hxx>
 #include <vcl/morebtn.hxx>
 #include <vcl/msgbox.hxx>
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"

-
+#include <sal/macros.h>
 #include "fmprop.hrc"
 #include "fmresids.hrc"
 #include "svx/fmtools.hxx"
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@ -29,6 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"

+#include <sal/macros.h>
 #include "fmhelp.hrc"
 #include <svx/gridctrl.hxx>
 #include "gridcell.hxx"
--- a/svx/source/form/ParseContext.cxx
+++ b/svx/source/form/ParseContext.cxx
@ -29,6 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"

+#include <sal/macros.h>
 #include "ParseContext.hxx"
 #include "stringlistresource.hxx"
 #include "fmresids.hrc"
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@ -29,6 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"

+#include <sal/macros.h>
 #include "datanavi.hxx"
 #include "fmservs.hxx"

--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@ -29,6 +29,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"

+#include <sal/macros.h>
+
 #include "fmhelp.hrc"
 #include "fmprop.hrc"
 #include "fmPropBrw.hxx"
--- a/svx/source/form/fmdmod.cxx
+++ b/svx/source/form/fmdmod.cxx
@ -28,6 +28,7 @@

 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
+#include <sal/macros.h>
 #include <svx/fmdmod.hxx>
 #include "fmservs.hxx"
 #include <fmobj.hxx>
--- a/svx/source/form/fmpage.cxx
+++ b/svx/source/form/fmpage.cxx
@ -28,6 +28,7 @@

 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
+#include <sal/macros.h>

 #define ENABLE_BYTESTRING_STREAM_OPERATORS
 #include <svx/fmpage.hxx>
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@ -29,6 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"

+#include <sal/macros.h>
 #include "fmitems.hxx"
 #include "fmobj.hxx"
 #include "fmpgeimp.hxx"
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@ -29,6 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"

+#include <sal/macros.h>
 #include "fmundo.hxx"
 #include "fmpgeimp.hxx"
 #include "svx/dbtoolsclient.hxx"
--- a/svx/source/form/formcontrolling.cxx
+++ b/svx/source/form/formcontrolling.cxx
@ -29,6 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"

+#include <sal/macros.h>
 #include "formcontrolling.hxx"
 #include "fmurl.hxx"
 #include "svx/svxids.hrc"
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@ -29,6 +29,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"

+#include <sal/macros.h>
+
 #define _SVX_USE_UNOGLOBALS_

 #include <com/sun/star/table/XTable.hpp>
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@ -28,6 +28,7 @@

 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
+#include <sal/macros.h>
 #include <com/sun/star/embed/XTransactedObject.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
--- a/ucb/source/ucp/gio/gio_content.cxx
+++ b/ucb/source/ucp/gio/gio_content.cxx
@ -29,7 +29,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <sys/types.h>
-
+#include <sal/macros.h>
 #include <osl/time.h>

 #include <osl/diagnose.h>
--- a/uui/source/masterpasscrtdlg.cxx
+++ b/uui/source/masterpasscrtdlg.cxx
@ -26,6 +26,7 @@
 *
 ************************************************************************/

+#include <sal/macros.h>
 #include <svtools/filedlg.hxx>
 #include <vcl/msgbox.hxx>

--- a/uui/source/passcrtdlg.cxx
+++ b/uui/source/passcrtdlg.cxx
@ -26,6 +26,7 @@
 *
 ************************************************************************/

+#include <sal/macros.h>
 #include <svtools/filedlg.hxx>
 #include <vcl/msgbox.hxx>

--- a/uui/source/passworddlg.cxx
+++ b/uui/source/passworddlg.cxx
@ -26,6 +26,7 @@
 *
 ************************************************************************/

+#include <sal/macros.h>
 #include <svtools/filedlg.hxx>
 #include <vcl/msgbox.hxx>

--- a/uui/source/secmacrowarnings.cxx
+++ b/uui/source/secmacrowarnings.cxx
@ -32,6 +32,7 @@
 #include <comphelper/sequence.hxx>
 #include "comphelper/documentconstants.hxx"
 #include <comphelper/processfactory.hxx>
+#include <sal/macros.h>

 #include <vcl/msgbox.hxx>
 #include <com/sun/star/security/NoPasswordException.hpp>
--- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx
+++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
@ -27,6 +27,7 @@
 ************************************************************************/

 #include "vbahelper/vbaapplicationbase.hxx"
+#include <sal/macros.h>

 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
--- a/vbahelper/source/vbahelper/vbaglobalbase.cxx
+++ b/vbahelper/source/vbahelper/vbaglobalbase.cxx
@ -26,6 +26,7 @@
 *
 ************************************************************************/
 #include "vbahelper/vbaglobalbase.hxx"
+#include <sal/macros.h>

 #include <cppuhelper/component_context.hxx>
 #include <comphelper/processfactory.hxx>
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@ -28,6 +28,7 @@

 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
+#include <sal/macros.h>
 #include <xmloff/xmltoken.hxx>
 #include <tools/debug.hxx>
 #include <rtl/ustring.hxx>
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@ -69,6 +69,7 @@
 #include <tools/time.hxx>
 #include <tools/diagnose_ex.h>
 #include <comphelper/extract.hxx>
+#include <sal/macros.h>

 #include <stdio.h>
 #include <algorithm>