--- cui/source/factory/cuiresmgr.cxx | 1 - cui/source/factory/dlgfact.cxx | 1 - cui/source/inc/about.hxx | 1 - dbaccess/source/core/api/viewcontainer.cxx | 1 - dbaccess/source/ui/inc/charsets.hxx | 1 - dbaccess/source/ui/inc/imageprovider.hxx | 1 + desktop/source/app/userinstall.cxx | 1 - .../deployment/gui/dp_gui_dependencydialog.cxx | 1 - .../source/deployment/gui/dp_gui_updatedialog.cxx | 1 - .../deployment/gui/dp_gui_updateinstalldialog.cxx | 1 - desktop/source/deployment/inc/dp_resource.h | 1 - desktop/source/deployment/misc/dp_resource.cxx | 1 + editeng/inc/editeng/outliner.hxx | 1 + forms/source/richtext/richtextunowrapper.cxx | 1 + fpicker/source/aqua/SalAquaFilePicker.mm | 1 - fpicker/source/aqua/SalAquaFolderPicker.mm | 2 -- fpicker/source/office/iodlgimp.cxx | 1 - framework/source/dispatch/menudispatcher.cxx | 1 - framework/source/services/backingcomp.cxx | 1 - sc/source/core/tool/compiler.cxx | 1 - sd/source/ui/dlg/sddlgfact.cxx | 1 - sfx2/source/appl/appcfg.cxx | 1 - sfx2/source/appl/appdata.cxx | 1 - sfx2/source/appl/appinit.cxx | 1 - sfx2/source/appl/appuno.cxx | 1 - sfx2/source/config/evntconf.cxx | 1 - sfx2/source/dialog/filtergrouping.cxx | 1 - sfx2/source/doc/doctempl.cxx | 1 - sfx2/source/doc/objxtor.cxx | 1 - svtools/source/config/miscopt.cxx | 1 - svtools/source/contnr/contentenumeration.hxx | 1 + svtools/source/dialogs/insdlg.cxx | 1 - svtools/source/graphic/transformer.cxx | 1 - svx/source/dialog/dialmgr.cxx | 1 - svx/source/form/fmobj.cxx | 1 - svx/source/inc/AccessibleFrameSelector.hxx | 1 + sw/inc/ccoll.hxx | 1 - sw/source/ui/inc/swrenamexnameddlg.hxx | 1 - sw/source/ui/inc/swuiccoll.hxx | 1 + sw/source/ui/inc/swuicnttab.hxx | 1 - tools/inc/tools/resary.hxx | 3 ++- tools/source/fsys/wntmsc.cxx | 1 - tools/source/rc/resary.cxx | 1 + unotools/source/config/defaultoptions.cxx | 1 - unotools/source/config/extendedsecurityoptions.cxx | 1 - unotools/source/config/inetoptions.cxx | 1 - unotools/source/config/pathoptions.cxx | 1 - vcl/aqua/source/app/salsys.cxx | 2 -- vcl/inc/vcl/bitmap.hxx | 2 +- vcl/inc/vcl/pdfwriter.hxx | 1 + vcl/ios/source/app/salsys.cxx | 2 -- vcl/source/control/field.cxx | 1 - 52 files changed, 12 insertions(+), 46 deletions(-)
diff --git a/cui/source/factory/cuiresmgr.cxx b/cui/source/factory/cuiresmgr.cxx index 8e3bc31..20d41b3 100644 --- a/cui/source/factory/cuiresmgr.cxx +++ b/cui/source/factory/cuiresmgr.cxx @@ -29,7 +29,6 @@ // include --------------------------------------------------------------- #include <dialmgr.hxx> -#include <tools/rc.hxx> #include <svl/solar.hrc> #include <vcl/svapp.hxx> diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index dc7c368..55b2b72 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -29,7 +29,6 @@ #include "align.hxx" //add for SvxAlignmentTabPage #include "dlgfact.hxx" -#include <tools/rc.hxx> #include <sfx2/basedlgs.hxx> #include <sfx2/app.hxx> #include <sfx2/request.hxx> diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx index 4e09e0e..e7e5227 100644 --- a/cui/source/inc/about.hxx +++ b/cui/source/inc/about.hxx @@ -30,7 +30,6 @@ // include --------------------------------------------------------------- -#include <tools/resary.hxx> #include <vcl/button.hxx> #include <vcl/accel.hxx> #include <svtools/svmedit.hxx> diff --git a/dbaccess/source/core/api/viewcontainer.cxx b/dbaccess/source/core/api/viewcontainer.cxx index 83badfb..4f004e1 100644 --- a/dbaccess/source/core/api/viewcontainer.cxx +++ b/dbaccess/source/core/api/viewcontainer.cxx @@ -34,7 +34,6 @@ #include "View.hxx" #include <tools/debug.hxx> -#include <tools/wldcrd.hxx> #include <comphelper/enumhelper.hxx> #include <comphelper/types.hxx> #include <connectivity/dbtools.hxx> diff --git a/dbaccess/source/ui/inc/charsets.hxx b/dbaccess/source/ui/inc/charsets.hxx index f5f5169..89fa3d4 100644 --- a/dbaccess/source/ui/inc/charsets.hxx +++ b/dbaccess/source/ui/inc/charsets.hxx @@ -30,7 +30,6 @@ #define _DBAUI_CHARSETS_HXX_ #include <tools/string.hxx> -#include <tools/rc.hxx> #include <connectivity/dbcharset.hxx> #include <svx/txenctab.hxx> diff --git a/dbaccess/source/ui/inc/imageprovider.hxx b/dbaccess/source/ui/inc/imageprovider.hxx index e3b5489..85ac3a5 100644 --- a/dbaccess/source/ui/inc/imageprovider.hxx +++ b/dbaccess/source/ui/inc/imageprovider.hxx @@ -36,6 +36,7 @@ #include <com/sun/star/sdb/application/DatabaseObject.hpp> /** === end UNO includes === **/ +#include <tools/string.hxx> #include <boost/shared_ptr.hpp> //........................................................................ diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx index 4815558..f91eb1f 100644 --- a/desktop/source/app/userinstall.cxx +++ b/desktop/source/app/userinstall.cxx @@ -41,7 +41,6 @@ #include <osl/security.hxx> #include <rtl/ref.hxx> -#include <tools/resmgr.hxx> #include <unotools/bootstrap.hxx> #include <svl/languageoptions.hxx> #include <unotools/syslocaleoptions.hxx> diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx index 604a696..314660a 100644 --- a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx @@ -35,7 +35,6 @@ #include "rtl/ustring.hxx" #include "tools/gen.hxx" #include "tools/resid.hxx" -#include "tools/resmgr.hxx" #include "tools/solar.h" #include "tools/string.hxx" #include "vcl/dialog.hxx" diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index 0445ed7..a5d9ab3 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -96,7 +96,6 @@ #include "tools/gen.hxx" #include "tools/link.hxx" #include "tools/resid.hxx" -#include "tools/resmgr.hxx" #include "tools/solar.h" #include "tools/string.hxx" #include "unotools/configmgr.hxx" diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx index 35dc8f3..76c250e 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx @@ -34,7 +34,6 @@ #include "osl/conditn.hxx" #include "cppuhelper/exc_hlp.hxx" #include "tools/resid.hxx" -#include "tools/resmgr.hxx" #include "tools/solar.h" #include "tools/string.hxx" #include "vcl/dialog.hxx" diff --git a/desktop/source/deployment/inc/dp_resource.h b/desktop/source/deployment/inc/dp_resource.h index d7c16bb..d39aa24 100644 --- a/desktop/source/deployment/inc/dp_resource.h +++ b/desktop/source/deployment/inc/dp_resource.h @@ -29,7 +29,6 @@ #if ! defined INCLUDED_DP_RESOURCE_H #define INCLUDED_DP_RESOURCE_H -#include "tools/resmgr.hxx" #include "tools/string.hxx" #include "tools/resid.hxx" #include "com/sun/star/lang/Locale.hpp" diff --git a/desktop/source/deployment/misc/dp_resource.cxx b/desktop/source/deployment/misc/dp_resource.cxx index 04609e7..4999e78 100644 --- a/desktop/source/deployment/misc/dp_resource.cxx +++ b/desktop/source/deployment/misc/dp_resource.cxx @@ -31,6 +31,7 @@ #include "dp_resource.h" #include "osl/module.hxx" #include "osl/mutex.hxx" +#include <tools/resmgr.hxx> #include "rtl/ustring.h" #include "cppuhelper/implbase1.hxx" #include "unotools/configmgr.hxx" diff --git a/editeng/inc/editeng/outliner.hxx b/editeng/inc/editeng/outliner.hxx index dbcc958..416dade 100644 --- a/editeng/inc/editeng/outliner.hxx +++ b/editeng/inc/editeng/outliner.hxx @@ -41,6 +41,7 @@ #include <tools/link.hxx> #include <rsc/rscsfx.hxx> #include "editeng/editengdllapi.h" +#include <com/sun/star/lang/Locale.hpp> #include <svtools/grfmgr.hxx> diff --git a/forms/source/richtext/richtextunowrapper.cxx b/forms/source/richtext/richtextunowrapper.cxx index 67d65cc..5b07844 100644 --- a/forms/source/richtext/richtextunowrapper.cxx +++ b/forms/source/richtext/richtextunowrapper.cxx @@ -29,6 +29,7 @@ #include "richtextunowrapper.hxx" /** === begin UNO includes === **/ +#include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/container/XNameContainer.hpp> /** === end UNO includes === **/ #include <editeng/unofored.hxx> diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm index 2d80b30..02408a9 100644 --- a/fpicker/source/aqua/SalAquaFilePicker.mm +++ b/fpicker/source/aqua/SalAquaFilePicker.mm @@ -46,7 +46,6 @@ #include "resourceprovider.hxx" -#include <tools/rc.hxx> #include <osl/file.hxx> #include "CFStringUtilities.hxx" #include "NSString_OOoAdditions.hxx" diff --git a/fpicker/source/aqua/SalAquaFolderPicker.mm b/fpicker/source/aqua/SalAquaFolderPicker.mm index 838f9e3..0ee6bc6 100644 --- a/fpicker/source/aqua/SalAquaFolderPicker.mm +++ b/fpicker/source/aqua/SalAquaFolderPicker.mm @@ -49,8 +49,6 @@ #include "resourceprovider.hxx" -#include <tools/rc.hxx> - #include <osl/file.hxx> #include "CFStringUtilities.hxx" #include "NSString_OOoAdditions.hxx" diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx index 046a4a4..5e02c2d 100644 --- a/fpicker/source/office/iodlgimp.cxx +++ b/fpicker/source/office/iodlgimp.cxx @@ -32,7 +32,6 @@ #include "iodlgimp.hxx" #include "svtools/headbar.hxx" #include <tools/debug.hxx> -#include <tools/wldcrd.hxx> #include <tools/urlobj.hxx> #include <vcl/menu.hxx> #include <vcl/msgbox.hxx> diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx index df6f90c..969d68f 100644 --- a/framework/source/dispatch/menudispatcher.cxx +++ b/framework/source/dispatch/menudispatcher.cxx @@ -55,7 +55,6 @@ #include <vcl/syswin.hxx> #include <vcl/menu.hxx> #include <vcl/svapp.hxx> -#include <tools/resmgr.hxx> #include <tools/rcid.h> #include <osl/mutex.hxx> #include <toolkit/helper/vclunohelper.hxx> diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx index 19d62d2..619bfdb 100644 --- a/framework/source/services/backingcomp.cxx +++ b/framework/source/services/backingcomp.cxx @@ -62,7 +62,6 @@ #include <vcl/keycod.hxx> #include <vcl/wrkwin.hxx> #include <vcl/svapp.hxx> -#include <tools/resmgr.hxx> #include <rtl/ustrbuf.hxx> #include <svl/solar.hrc> diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index 66d807f..3b5349d 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -36,7 +36,6 @@ #include <svl/zforlist.hxx> #include <sal/macros.h> #include <tools/rcid.h> -#include <tools/rc.hxx> #include <tools/solar.h> #include <unotools/charclass.hxx> #include <com/sun/star/lang/Locale.hpp> diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx index 5cae0f3..7133599 100644 --- a/sd/source/ui/dlg/sddlgfact.cxx +++ b/sd/source/ui/dlg/sddlgfact.cxx @@ -32,7 +32,6 @@ #endif #include <sfx2/objsh.hxx> -#include <tools/rc.hxx> #include "sddlgfact.hxx" #include "strings.hrc" #include "BreakDlg.hxx" diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index ca3e4fa..34ddabe 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -55,7 +55,6 @@ #include <unotools/configmgr.hxx> #include <tools/urlobj.hxx> -#include <tools/wldcrd.hxx> #include <unotools/saveopt.hxx> #include <svtools/helpopt.hxx> #include <unotools/undoopt.hxx> diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx index ee1443a..035e4a2 100644 --- a/sfx2/source/appl/appdata.cxx +++ b/sfx2/source/appl/appdata.cxx @@ -27,7 +27,6 @@ ************************************************************************/ #include <tools/config.hxx> -#include <svl/inetstrm.hxx> #include <svl/stritem.hxx> #define _SVSTDARR_STRINGS diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index 8f48fd3..48dbcdf 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -37,7 +37,6 @@ #include <svtools/svtools.hrc> #include <unotools/saveopt.hxx> #include <unotools/localisationoptions.hxx> -#include <tools/resary.hxx> #include <svl/intitem.hxx> #include <svl/eitem.hxx> #include <svl/stritem.hxx> diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index 7680ff2..b9ae282 100644 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -42,7 +42,6 @@ #include <svl/itempool.hxx> #include <svl/rectitem.hxx> #include <tools/debug.hxx> -#include <tools/wldcrd.hxx> #include <tools/urlobj.hxx> #include <tools/config.hxx> diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx index 575ea4b..b839bd89 100644 --- a/sfx2/source/config/evntconf.cxx +++ b/sfx2/source/config/evntconf.cxx @@ -30,7 +30,6 @@ #include <boost/scoped_ptr.hpp> #include <vcl/msgbox.hxx> -#include <tools/resary.hxx> #include <svl/lstner.hxx> #include <basic/basmgr.hxx> #include <basic/sbmod.hxx> diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx index 98e5836..5470288 100644 --- a/sfx2/source/dialog/filtergrouping.cxx +++ b/sfx2/source/dialog/filtergrouping.cxx @@ -41,7 +41,6 @@ #include <comphelper/processfactory.hxx> #include <comphelper/sequenceashashmap.hxx> #include <comphelper/string.hxx> -#include <tools/wldcrd.hxx> #include <tools/diagnose_ex.h> #include <list> diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx index d990d25..a62d1fe 100644 --- a/sfx2/source/doc/doctempl.cxx +++ b/sfx2/source/doc/doctempl.cxx @@ -32,7 +32,6 @@ #include <osl/mutex.hxx> #include <osl/thread.hxx> -#include <tools/resary.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <unotools/localedatawrapper.hxx> diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index d666204..47105d7 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -41,7 +41,6 @@ #include <com/sun/star/frame/XTitle.hpp> #include <osl/mutex.hxx> -#include <tools/resary.hxx> #include <vcl/msgbox.hxx> #include <vcl/wrkwin.hxx> #include <vcl/svapp.hxx> diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx index c1d418b..a2f26ff 100644 --- a/svtools/source/config/miscopt.cxx +++ b/svtools/source/config/miscopt.cxx @@ -33,7 +33,6 @@ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <tools/link.hxx> -#include <tools/wldcrd.hxx> #include <rtl/logfile.hxx> #include <rtl/instance.hxx> diff --git a/svtools/source/contnr/contentenumeration.hxx b/svtools/source/contnr/contentenumeration.hxx index c8e42ba..4cb8f9c 100644 --- a/svtools/source/contnr/contentenumeration.hxx +++ b/svtools/source/contnr/contentenumeration.hxx @@ -38,6 +38,7 @@ #include <ucbhelper/content.hxx> #include <rtl/ustring.hxx> #include <tools/datetime.hxx> +#include <tools/string.hxx> #include <vcl/image.hxx> class IUrlFilter; diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx index 347fdd1..351236e 100644 --- a/svtools/source/dialogs/insdlg.cxx +++ b/svtools/source/dialogs/insdlg.cxx @@ -35,7 +35,6 @@ #include <svtools/sores.hxx> #include <svtools/svtdata.hxx> -#include <tools/rc.hxx> #include <unotools/configmgr.hxx> #include <sot/clsids.hxx> #include <sot/stg.hxx> diff --git a/svtools/source/graphic/transformer.cxx b/svtools/source/graphic/transformer.cxx index 8b3f136..9bc4753 100644 --- a/svtools/source/graphic/transformer.cxx +++ b/svtools/source/graphic/transformer.cxx @@ -33,7 +33,6 @@ #include <vcl/metaact.hxx> #include <tools/rcid.h> #include <tools/resid.hxx> -#include <tools/resmgr.hxx> #include <unotools/ucbstreamhelper.hxx> #include <svl/solar.hrc> #include <vcl/salbtype.hxx> diff --git a/svx/source/dialog/dialmgr.cxx b/svx/source/dialog/dialmgr.cxx index eb4bffa..fb6014d 100644 --- a/svx/source/dialog/dialmgr.cxx +++ b/svx/source/dialog/dialmgr.cxx @@ -34,7 +34,6 @@ // include --------------------------------------------------------------- #include <svx/dialmgr.hxx> -#include <tools/rc.hxx> #include <svl/solar.hrc> #include <vcl/svapp.hxx> diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx index 206deda..1a28410 100644 --- a/svx/source/form/fmobj.cxx +++ b/svx/source/form/fmobj.cxx @@ -53,7 +53,6 @@ #include <comphelper/processfactory.hxx> #include <toolkit/awt/vclxdevice.hxx> #include <vcl/svapp.hxx> -#include <tools/resmgr.hxx> #include <tools/diagnose_ex.h> using namespace ::com::sun::star::io; diff --git a/svx/source/inc/AccessibleFrameSelector.hxx b/svx/source/inc/AccessibleFrameSelector.hxx index 09aeeff..052dbef 100644 --- a/svx/source/inc/AccessibleFrameSelector.hxx +++ b/svx/source/inc/AccessibleFrameSelector.hxx @@ -37,6 +37,7 @@ #include <com/sun/star/accessibility/XAccessibleComponent.hpp> #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp> #include <tools/resary.hxx> +#include <tools/rc.hxx> #include <cppuhelper/implbase5.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <comphelper/accessibleeventnotifier.hxx> diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx index 35ea265..24b140d 100644 --- a/sw/inc/ccoll.hxx +++ b/sw/inc/ccoll.hxx @@ -38,7 +38,6 @@ #include <svtools/svtabbx.hxx> #include <vcl/lstbox.hxx> -#include <tools/resary.hxx> #include "swdllapi.h" #include "cmdid.h" diff --git a/sw/source/ui/inc/swrenamexnameddlg.hxx b/sw/source/ui/inc/swrenamexnameddlg.hxx index de02fa8..1f21305 100644 --- a/sw/source/ui/inc/swrenamexnameddlg.hxx +++ b/sw/source/ui/inc/swrenamexnameddlg.hxx @@ -39,7 +39,6 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/awt/XControl.hpp> #include <com/sun/star/container/XNamed.hpp> -#include <tools/resary.hxx> #include <swunodef.hxx> class SwRenameXNamedDlg : public ModalDialog diff --git a/sw/source/ui/inc/swuiccoll.hxx b/sw/source/ui/inc/swuiccoll.hxx index b665a06..96e11da 100644 --- a/sw/source/ui/inc/swuiccoll.hxx +++ b/sw/source/ui/inc/swuiccoll.hxx @@ -28,6 +28,7 @@ #ifndef _SWUI_CCOLL_HXX #define _SWUI_CCOLL_HXX +#include <tools/resary.hxx> #include "ccoll.hxx" class SwWrtShell; diff --git a/sw/source/ui/inc/swuicnttab.hxx b/sw/source/ui/inc/swuicnttab.hxx index 727cdae..7a4557b 100644 --- a/sw/source/ui/inc/swuicnttab.hxx +++ b/sw/source/ui/inc/swuicnttab.hxx @@ -43,7 +43,6 @@ #include "tox.hxx" #include <toxmgr.hxx> #include <svx/checklbx.hxx> -#include <tools/resary.hxx> #include <svtools/svtreebx.hxx> #include <vcl/menubtn.hxx> #include <svx/langbox.hxx> diff --git a/tools/inc/tools/resary.hxx b/tools/inc/tools/resary.hxx index 6f3af58..429c05d 100644 --- a/tools/inc/tools/resary.hxx +++ b/tools/inc/tools/resary.hxx @@ -28,9 +28,10 @@ #ifndef _TOOLS_RESARY_HXX #define _TOOLS_RESARY_HXX +#include <vector> #include "tools/toolsdllapi.h" +#include <tools/string.hxx> #include <tools/resid.hxx> -#include <tools/rc.hxx> // --------------------- // - ImplResStringItem - diff --git a/tools/source/fsys/wntmsc.cxx b/tools/source/fsys/wntmsc.cxx index cc6d77b..932973c 100644 --- a/tools/source/fsys/wntmsc.cxx +++ b/tools/source/fsys/wntmsc.cxx @@ -40,7 +40,6 @@ #include "wntmsc.hxx" #include <tools/errinf.hxx> #include <tools/debug.hxx> -#include <tools/wldcrd.hxx> #include <tools/fsys.hxx> #include <vector> diff --git a/tools/source/rc/resary.cxx b/tools/source/rc/resary.cxx index c4f1166..7b831c6 100644 --- a/tools/source/rc/resary.cxx +++ b/tools/source/rc/resary.cxx @@ -28,6 +28,7 @@ #define _TOOLS_RESARY_CXX +#include <tools/resmgr.hxx> #include <tools/resary.hxx> #include <tools/rcid.h> diff --git a/unotools/source/config/defaultoptions.cxx b/unotools/source/config/defaultoptions.cxx index c7b1a82..eb8c600 100644 --- a/unotools/source/config/defaultoptions.cxx +++ b/unotools/source/config/defaultoptions.cxx @@ -32,7 +32,6 @@ #include <unotools/configitem.hxx> #include <unotools/configmgr.hxx> #include <tools/debug.hxx> -#include <tools/resmgr.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <osl/mutex.hxx> diff --git a/unotools/source/config/extendedsecurityoptions.cxx b/unotools/source/config/extendedsecurityoptions.cxx index 3d51cda..1608cdc 100644 --- a/unotools/source/config/extendedsecurityoptions.cxx +++ b/unotools/source/config/extendedsecurityoptions.cxx @@ -32,7 +32,6 @@ #include <tools/debug.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> -#include <tools/wldcrd.hxx> #include <rtl/ustrbuf.hxx> #include <unotools/pathoptions.hxx> diff --git a/unotools/source/config/inetoptions.cxx b/unotools/source/config/inetoptions.cxx index 4ed1408..d49726b 100644 --- a/unotools/source/config/inetoptions.cxx +++ b/unotools/source/config/inetoptions.cxx @@ -28,7 +28,6 @@ #include <unotools/inetoptions.hxx> #include "rtl/instance.hxx" -#include <tools/wldcrd.hxx> #include <algorithm> #include <map> diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx index 1411d79..50a9ccf 100644 --- a/unotools/source/config/pathoptions.cxx +++ b/unotools/source/config/pathoptions.cxx @@ -30,7 +30,6 @@ #include <unotools/configitem.hxx> #include <unotools/configmgr.hxx> #include <tools/debug.hxx> -#include <tools/resmgr.hxx> #include <tools/urlobj.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> diff --git a/vcl/aqua/source/app/salsys.cxx b/vcl/aqua/source/app/salsys.cxx index 0061d63..d85f7ae 100644 --- a/vcl/aqua/source/app/salsys.cxx +++ b/vcl/aqua/source/app/salsys.cxx @@ -27,8 +27,6 @@ ************************************************************************/ -#include "tools/rc.hxx" - #include "rtl/ustrbuf.hxx" #include "vcl/button.hxx" diff --git a/vcl/inc/vcl/bitmap.hxx b/vcl/inc/vcl/bitmap.hxx index dfe5e4d..17041d8 100644 --- a/vcl/inc/vcl/bitmap.hxx +++ b/vcl/inc/vcl/bitmap.hxx @@ -29,10 +29,10 @@ #ifndef _SV_BITMAP_HXX #define _SV_BITMAP_HXX +#include <tools/link.hxx> #include <vcl/sv.h> #include <vcl/dllapi.h> #include <vcl/mapmod.hxx> -#include <tools/rc.hxx> #include <vcl/region.hxx> #include <vcl/scopedbitmapaccess.hxx> diff --git a/vcl/inc/vcl/pdfwriter.hxx b/vcl/inc/vcl/pdfwriter.hxx index 816518b..b14ebd5 100644 --- a/vcl/inc/vcl/pdfwriter.hxx +++ b/vcl/inc/vcl/pdfwriter.hxx @@ -41,6 +41,7 @@ #include "com/sun/star/io/XOutputStream.hpp" #include "com/sun/star/beans/XMaterialHolder.hpp" +#include "com/sun/star/lang/Locale.hpp" #include <boost/scoped_ptr.hpp> diff --git a/vcl/ios/source/app/salsys.cxx b/vcl/ios/source/app/salsys.cxx index 9d300fd..fbc7bb4 100644 --- a/vcl/ios/source/app/salsys.cxx +++ b/vcl/ios/source/app/salsys.cxx @@ -27,8 +27,6 @@ ************************************************************************/ -#include "tools/rc.hxx" - #include "rtl/ustrbuf.hxx" #include "vcl/button.hxx" diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index bcd330f..1538287 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -32,7 +32,6 @@ #include "tools/debug.hxx" #include "tools/rc.h" -#include "tools/resary.hxx" #include "vcl/field.hxx" #include "vcl/event.hxx"
_______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
