mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove _SVSTDARR_STRINGSISORTDTOR

Browse Source
This commit is contained in:
August Sodora 2012-01-09 20:37:49 -05:00
parent 2f9231f320
commit bcb9ddaa7e
120 changed files with 5 additions and 456 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cui/source/customize/cfgutil.cxx
View File

@ -67,8 +67,6 @@
#include <unotools/configmgr.hxx> #include <unotools/configmgr.hxx>
#include "dialmgr.hxx" #include "dialmgr.hxx"
#include <svl/stritem.hxx> #include <svl/stritem.hxx>
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
using namespace ::com::sun::star; using namespace ::com::sun::star;

1
cui/source/customize/macropg.cxx
View File

@ -30,7 +30,6 @@
#include "macropg.hxx" #include "macropg.hxx"
#include <vcl/msgbox.hxx> #include <vcl/msgbox.hxx>
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <svtools/svmedit.hxx> #include <svtools/svmedit.hxx>
#include <svl/eitem.hxx> #include <svl/eitem.hxx>

1
cui/source/customize/selector.cxx
View File

@ -71,7 +71,6 @@ using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::document; using namespace ::com::sun::star::document;
using namespace ::com::sun::star::container; using namespace ::com::sun::star::container;
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <svtools/imagemgr.hxx> #include <svtools/imagemgr.hxx>
#include <tools/urlobj.hxx> #include <tools/urlobj.hxx>

2
cui/source/dialogs/insdlg.cxx
View File

@ -76,10 +76,8 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star::ui::dialogs;
using ::rtl::OUString; using ::rtl::OUString;
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
static String impl_getSvtResString( sal_uInt32 nId ) static String impl_getSvtResString( sal_uInt32 nId )
{ {
String aRet; String aRet;

1
cui/source/dialogs/linkdlg.cxx
View File

@ -51,7 +51,6 @@
#include <dialmgr.hxx> #include <dialmgr.hxx>
#define _SVSTDARR_USHORTS
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#define MAX_FILENAME 18 #define MAX_FILENAME 18

6
cui/source/inc/acccfg.hxx
View File

@ -52,16 +52,10 @@
#include <svtools/svtreebx.hxx> #include <svtools/svtreebx.hxx>
#include <sfx2/tabdlg.hxx> #include <sfx2/tabdlg.hxx>
#include <sfx2/basedlgs.hxx> #include <sfx2/basedlgs.hxx>
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <sfx2/minarray.hxx> #include <sfx2/minarray.hxx>
#include "cfgutil.hxx" #include "cfgutil.hxx"
// class SfxAcceleratorConfigListBox *************************************************
#define css ::com::sun::star #define css ::com::sun::star
class SfxMacroInfoItem; class SfxMacroInfoItem;

3
cui/source/inc/cfgutil.hxx
View File

@ -37,10 +37,7 @@
#include <com/sun/star/lang/XSingleComponentFactory.hpp> #include <com/sun/star/lang/XSingleComponentFactory.hpp>
#include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/script/browse/XBrowseNode.hpp> #include <com/sun/star/script/browse/XBrowseNode.hpp>
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <vcl/timer.hxx> #include <vcl/timer.hxx>
#include <svtools/svtabbx.hxx> #include <svtools/svtabbx.hxx>
#include <svtools/svtreebx.hxx> #include <svtools/svtreebx.hxx>

6
cui/source/inc/cuifmsearch.hxx
View File

@ -32,16 +32,10 @@
#include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/sdbc/XResultSet.hpp>
#include <svx/fmsearch.hxx> #include <svx/fmsearch.hxx>
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <vcl/dialog.hxx> #include <vcl/dialog.hxx>
#include <vcl/button.hxx> #include <vcl/button.hxx>
#include <vcl/fixed.hxx> #include <vcl/fixed.hxx>
#include <vcl/edit.hxx> #include <vcl/edit.hxx>
#include <vcl/combobox.hxx> #include <vcl/combobox.hxx>
#include <vcl/lstbox.hxx> #include <vcl/lstbox.hxx>

4
cui/source/inc/cuisrchdlg.hxx
View File

@ -28,9 +28,6 @@
#ifndef _CUI_SRCHDLG_HXX #ifndef _CUI_SRCHDLG_HXX
#define _CUI_SRCHDLG_HXX #define _CUI_SRCHDLG_HXX
// include ---------------------------------------------------------------
#include <svtools/stdctrl.hxx> #include <svtools/stdctrl.hxx>
#include <vcl/combobox.hxx> #include <vcl/combobox.hxx>
#include <vcl/edit.hxx> #include <vcl/edit.hxx>
@ -42,7 +39,6 @@
#include <sfx2/childwin.hxx> #include <sfx2/childwin.hxx>
#include <sfx2/basedlgs.hxx> #include <sfx2/basedlgs.hxx>
#include <svl/svarray.hxx> #include <svl/svarray.hxx>
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <svtools/svmedit.hxx> #include <svtools/svmedit.hxx>
#include <svl/srchdefs.hxx> #include <svl/srchdefs.hxx>

3
cui/source/tabpages/autocdlg.cxx
View File

@ -26,9 +26,6 @@
* *
************************************************************************/ ************************************************************************/
#define _SVSTDARR_STRINGSISORTDTOR
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <vcl/msgbox.hxx> #include <vcl/msgbox.hxx>
#include <vcl/field.hxx> #include <vcl/field.hxx>

2
cui/source/tabpages/macroass.cxx
View File

@ -36,9 +36,7 @@
#include <comphelper/string.hxx> #include <comphelper/string.hxx>
#include <dialmgr.hxx> #include <dialmgr.hxx>
#include <svx/dialogs.hrc> #include <svx/dialogs.hrc>
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <svtools/svmedit.hxx> #include <svtools/svmedit.hxx>
#include "cfgutil.hxx" #include "cfgutil.hxx"
#include <sfx2/app.hxx> #include <sfx2/app.hxx>

2
cui/source/tabpages/numfmt.cxx
View File

@ -26,7 +26,6 @@
* *
************************************************************************/ ************************************************************************/
// include ---------------------------------------------------------------
#include <svl/eitem.hxx> #include <svl/eitem.hxx>
#include <svl/intitem.hxx> #include <svl/intitem.hxx>
#include <sfx2/objsh.hxx> #include <sfx2/objsh.hxx>
@ -34,7 +33,6 @@
#include <unotools/localedatawrapper.hxx> #include <unotools/localedatawrapper.hxx>
#include <i18npool/lang.h> #include <i18npool/lang.h>
#include <svx/dialogs.hrc> #include <svx/dialogs.hrc>
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <svtools/colorcfg.hxx> #include <svtools/colorcfg.hxx>

3
editeng/source/misc/SvXMLAutoCorrectExport.cxx
View File

@ -26,12 +26,9 @@
* *
************************************************************************/ ************************************************************************/
#include <SvXMLAutoCorrectExport.hxx> #include <SvXMLAutoCorrectExport.hxx>
#include <com/sun/star/util/MeasureUnit.hpp> #include <com/sun/star/util/MeasureUnit.hpp>
#define _SVSTDARR_STRINGSISORTDTOR
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <xmloff/xmltoken.hxx> #include <xmloff/xmltoken.hxx>

4
editeng/source/misc/SvXMLAutoCorrectImport.cxx
View File

@ -28,9 +28,6 @@
#include <SvXMLAutoCorrectImport.hxx> #include <SvXMLAutoCorrectImport.hxx>
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#define _SVSTDARR_STRINGSISORTDTOR
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <xmloff/xmltoken.hxx> #include <xmloff/xmltoken.hxx>
@ -38,7 +35,6 @@ using namespace ::com::sun::star;
using namespace ::xmloff::token; using namespace ::xmloff::token;
using namespace ::rtl; using namespace ::rtl;
static OUString sBlockList ( RTL_CONSTASCII_USTRINGPARAM ( "_block-list" ) ); static OUString sBlockList ( RTL_CONSTASCII_USTRINGPARAM ( "_block-list" ) );
SvXMLAutoCorrectImport::SvXMLAutoCorrectImport( SvXMLAutoCorrectImport::SvXMLAutoCorrectImport(

5
editeng/source/misc/svxacorr.cxx
View File

@ -26,8 +26,6 @@
* *
************************************************************************/ ************************************************************************/
#include <com/sun/star/io/XStream.hpp> #include <com/sun/star/io/XStream.hpp>
#include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/lang/Locale.hpp>
#include <tools/urlobj.hxx> #include <tools/urlobj.hxx>
@ -35,9 +33,6 @@
#include <i18npool/mslangid.hxx> #include <i18npool/mslangid.hxx>
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <sot/storinfo.hxx> #include <sot/storinfo.hxx>
// for the Sort-String-Arrays from SVMEM.HXX
#define _SVSTDARR_STRINGSISORTDTOR
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <svl/fstathelper.hxx> #include <svl/fstathelper.hxx>
#include <svtools/helpopt.hxx> #include <svtools/helpopt.hxx>

3
fpicker/source/odma/ODMAFolderPicker.cxx
View File

@ -27,12 +27,9 @@
* *
************************************************************************/ ************************************************************************/
#include "ODMAFolderPicker.hxx" #include "ODMAFolderPicker.hxx"
#define _SVSTDARR_STRINGSDTOR
#include "svl/svstdarr.hxx" #include "svl/svstdarr.hxx"
#include <com/sun/star/container/XContentEnumerationAccess.hpp> #include <com/sun/star/container/XContentEnumerationAccess.hpp>
#include <com/sun/star/container/XSet.hpp> #include <com/sun/star/container/XSet.hpp>
#include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Any.hxx>

1
fpicker/source/office/OfficeFilePicker.cxx
View File

@ -41,7 +41,6 @@
#endif #endif
#include <tools/urlobj.hxx> #include <tools/urlobj.hxx>
#include <tools/debug.hxx> #include <tools/debug.hxx>
#define _SVSTDARR_STRINGSDTOR
#include "svl/svstdarr.hxx" #include "svl/svstdarr.hxx"
#include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/ui/dialogs/FilePickerEvent.hpp> #include <com/sun/star/ui/dialogs/FilePickerEvent.hpp>

3
fpicker/source/office/OfficeFolderPicker.cxx
View File

@ -26,15 +26,12 @@
* *
************************************************************************/ ************************************************************************/
#include "OfficeFolderPicker.hxx" #include "OfficeFolderPicker.hxx"
#include "iodlg.hxx" #include "iodlg.hxx"
#include <list> #include <list>
#include <tools/urlobj.hxx> #include <tools/urlobj.hxx>
#define _SVSTDARR_STRINGSDTOR
#include "svl/svstdarr.hxx" #include "svl/svstdarr.hxx"
#include <com/sun/star/container/XContentEnumerationAccess.hpp> #include <com/sun/star/container/XContentEnumerationAccess.hpp>
#include <com/sun/star/container/XSet.hpp> #include <com/sun/star/container/XSet.hpp>

5
fpicker/source/office/iodlg.cxx
View File

@ -26,8 +26,6 @@
* *
************************************************************************/ ************************************************************************/
// includes --------------------------------------------------------------
#include <sal/macros.h> #include <sal/macros.h>
#include "iodlg.hxx" #include "iodlg.hxx"
#include <tools/stream.hxx> #include <tools/stream.hxx>
@ -48,9 +46,6 @@
#include "svtools/sfxecode.hxx" #include "svtools/sfxecode.hxx"
#include "svl/svarray.hxx" #include "svl/svarray.hxx"
#include "svtools/svtabbx.hxx" #include "svtools/svtabbx.hxx"
#define _SVSTDARR_USHORTS
#define _SVSTDARR_STRINGSDTOR
#include "svl/svstdarr.hxx" #include "svl/svstdarr.hxx"
#include <toolkit/helper/vclunohelper.hxx> #include <toolkit/helper/vclunohelper.hxx>
#include <unotools/localfilehelper.hxx> #include <unotools/localfilehelper.hxx>

7
fpicker/source/office/iodlgimp.cxx
View File

@ -26,9 +26,6 @@
* *
************************************************************************/ ************************************************************************/
// includes *******************************************************************
#include "iodlgimp.hxx" #include "iodlgimp.hxx"
#include "svtools/headbar.hxx" #include "svtools/headbar.hxx"
#include <tools/debug.hxx> #include <tools/debug.hxx>
@ -50,10 +47,6 @@
#include "unotools/useroptions.hxx" #include "unotools/useroptions.hxx"
#include "rtl/instance.hxx" #include "rtl/instance.hxx"
#include <svl/svl.hrc> #include <svl/svl.hrc>
#define _SVSTDARR_STRINGSSORTDTOR
#define _SVSTDARR_STRINGSDTOR
#define _SVSTDARR_USHORTS
#include "svl/svstdarr.hxx" #include "svl/svstdarr.hxx"
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;

1
idl/inc/object.hxx
View File

@ -29,7 +29,6 @@
#ifndef _OBJECT_HXX #ifndef _OBJECT_HXX
#define _OBJECT_HXX #define _OBJECT_HXX
#define _SVSTDARR_ULONGS
#include <types.hxx> #include <types.hxx>
#include <slot.hxx> #include <slot.hxx>
#include <vector> #include <vector>

3
sc/source/core/data/documen8.cxx
View File

@ -26,8 +26,6 @@
* *
************************************************************************/ ************************************************************************/
#include "scitems.hxx" #include "scitems.hxx"
#include <editeng/eeitem.hxx> #include <editeng/eeitem.hxx>
@ -47,7 +45,6 @@
#include <sfx2/viewsh.hxx> #include <sfx2/viewsh.hxx>
#include <svl/flagitem.hxx> #include <svl/flagitem.hxx>
#include <svl/intitem.hxx> #include <svl/intitem.hxx>
#define _SVSTDARR_USHORTS
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <svl/zforlist.hxx> #include <svl/zforlist.hxx>
#include <svl/zformat.hxx> #include <svl/zformat.hxx>

6
sc/source/filter/excel/excrecds.cxx
View File

@ -26,11 +26,6 @@
* *
************************************************************************/ ************************************************************************/
//------------------------------------------------------------------------
#include "excrecds.hxx" #include "excrecds.hxx"
#include <map> #include <map>
@ -63,7 +58,6 @@
#include <svl/zformat.hxx> #include <svl/zformat.hxx>
#include <svtools/ctrltool.hxx> #include <svtools/ctrltool.hxx>
#define _SVSTDARR_USHORTS
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <string.h> #include <string.h>

8
sc/source/filter/html/htmlexp.cxx
View File

@ -26,11 +26,6 @@
* *
************************************************************************/ ************************************************************************/
// INCLUDE ---------------------------------------------------------------
#include "scitems.hxx" #include "scitems.hxx"
#include <comphelper/string.hxx> #include <comphelper/string.hxx>
#include <editeng/eeitem.hxx> #include <editeng/eeitem.hxx>
@ -56,9 +51,6 @@
#include <sfx2/objsh.hxx> #include <sfx2/objsh.hxx>
#include <svl/stritem.hxx> #include <svl/stritem.hxx>
#include <svl/urihelper.hxx> #include <svl/urihelper.hxx>
#ifndef _SVSTDARR_STRINGSSORTDTOR
#define _SVSTDARR_STRINGSSORTDTOR
#endif
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <svl/zforlist.hxx> #include <svl/zforlist.hxx>
#include <svtools/htmlkywd.hxx> #include <svtools/htmlkywd.hxx>

7
sc/source/ui/inc/acredlin.hxx
View File

@ -34,19 +34,12 @@
#include <vcl/group.hxx> #include <vcl/group.hxx>
#include <svtools/headbar.hxx> #include <svtools/headbar.hxx>
#include <svtools/svtabbx.hxx> #include <svtools/svtabbx.hxx>
#include "rangenam.hxx" #include "rangenam.hxx"
#include "anyrefdg.hxx" #include "anyrefdg.hxx"
#include <vcl/lstbox.hxx> #include <vcl/lstbox.hxx>
#include <svx/ctredlin.hxx> #include <svx/ctredlin.hxx>
#include <svx/simptabl.hxx> #include <svx/simptabl.hxx>
#ifndef _SVARRAY_HXX
#define _SVARRAY_HXX
#include <svl/svarray.hxx> #include <svl/svarray.hxx>
#endif
#include "chgtrack.hxx" #include "chgtrack.hxx"
#include "chgviset.hxx" #include "chgviset.hxx"
#include <vcl/timer.hxx> #include <vcl/timer.hxx>

18
sfx2/inc/sfx2/appuno.hxx
View File

@ -28,10 +28,6 @@
#ifndef _SFX_APPUNO_HXX #ifndef _SFX_APPUNO_HXX
#define _SFX_APPUNO_HXX #define _SFX_APPUNO_HXX
//____________________________________________________________________________________________________________________________________
// generated header
//____________________________________________________________________________________________________________________________________
#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
@ -50,31 +46,17 @@
#include <com/sun/star/frame/XDispatchInformationProvider.hpp> #include <com/sun/star/frame/XDispatchInformationProvider.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp>
//____________________________________________________________________________________________________________________________________
// fix uno header
//____________________________________________________________________________________________________________________________________
#include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Any.h>
#include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Sequence.hxx>
#include <cppuhelper/weak.hxx> #include <cppuhelper/weak.hxx>
#include <cppuhelper/implbase4.hxx> #include <cppuhelper/implbase4.hxx>
//____________________________________________________________________________________________________________________________________
// something else header
//____________________________________________________________________________________________________________________________________
#include <tools/errcode.hxx> #include <tools/errcode.hxx>
#include <svl/svarray.hxx> #include <svl/svarray.hxx>
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <sfx2/sfxuno.hxx> #include <sfx2/sfxuno.hxx>
//____________________________________________________________________________________________________________________________________
// forwards
//____________________________________________________________________________________________________________________________________
//____________________________________________________________________________________________________________________________________
// declarations
//____________________________________________________________________________________________________________________________________
class SfxObjectShell; class SfxObjectShell;
class SfxMacroLoader : public ::com::sun::star::frame::XDispatchProvider, class SfxMacroLoader : public ::com::sun::star::frame::XDispatchProvider,
public ::com::sun::star::frame::XNotifyingDispatch, public ::com::sun::star::frame::XNotifyingDispatch,

3
sfx2/source/appl/app.cxx
View File

@ -50,10 +50,7 @@
#include <svl/svdde.hxx> #include <svl/svdde.hxx>
#include <unotools/tempfile.hxx> #include <unotools/tempfile.hxx>
#include <osl/file.hxx> #include <osl/file.hxx>
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XInitialization.hpp>

2
sfx2/source/appl/appopen.cxx
View File

@ -107,8 +107,6 @@
#include <sfx2/filedlghelper.hxx> #include <sfx2/filedlghelper.hxx>
#include <sfx2/docfac.hxx> #include <sfx2/docfac.hxx>
#include <sfx2/event.hxx> #include <sfx2/event.hxx>
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
using namespace ::com::sun::star; using namespace ::com::sun::star;

3
sfx2/source/appl/linkmgr2.cxx
View File

@ -26,7 +26,6 @@
* *
************************************************************************/ ************************************************************************/
#include <sfx2/linkmgr.hxx> #include <sfx2/linkmgr.hxx>
#include <com/sun/star/document/UpdateDocMode.hpp> #include <com/sun/star/document/UpdateDocMode.hpp>
#include <sfx2/objsh.hxx> #include <sfx2/objsh.hxx>
@ -50,8 +49,6 @@
#include "impldde.hxx" #include "impldde.hxx"
#include "app.hrc" #include "app.hrc"
#include "sfx2/sfxresid.hxx" #include "sfx2/sfxresid.hxx"
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XComponent.hpp>

3
sfx2/source/appl/sfxhelp.cxx
View File

@ -26,7 +26,6 @@
* *
************************************************************************/ ************************************************************************/
#include "sfx2/sfxhelp.hxx" #include "sfx2/sfxhelp.hxx"
#include <set> #include <set>
@ -65,8 +64,6 @@
#include <vcl/msgbox.hxx> #include <vcl/msgbox.hxx>
#include <svtools/ehdl.hxx> #include <svtools/ehdl.hxx>
#include <svtools/sfxecode.hxx> #include <svtools/sfxecode.hxx>
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include "newhelp.hxx" #include "newhelp.hxx"

3
sfx2/source/dialog/filedlgimpl.hxx
View File

@ -37,10 +37,7 @@
#include <com/sun/star/ui/dialogs/XFilePickerListener.hpp> #include <com/sun/star/ui/dialogs/XFilePickerListener.hpp>
#include <com/sun/star/ui/dialogs/XDialogClosedListener.hpp> #include <com/sun/star/ui/dialogs/XDialogClosedListener.hpp>
#include <sfx2/fcontnr.hxx> #include <sfx2/fcontnr.hxx>
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <sfx2/filedlghelper.hxx> #include <sfx2/filedlghelper.hxx>
#include <comphelper/sequenceasvector.hxx> #include <comphelper/sequenceasvector.hxx>

3
sfx2/source/dialog/templdlg.cxx
View File

@ -26,7 +26,6 @@
* *
************************************************************************/ ************************************************************************/
#include <boost/noncopyable.hpp> #include <boost/noncopyable.hpp>
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
@ -34,8 +33,6 @@
#include <svl/intitem.hxx> #include <svl/intitem.hxx>
#include <svl/stritem.hxx> #include <svl/stritem.hxx>
#include <svl/style.hxx> #include <svl/style.hxx>
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <comphelper/processfactory.hxx> #include <comphelper/processfactory.hxx>
#include <comphelper/sequenceashashmap.hxx> #include <comphelper/sequenceashashmap.hxx>

2
sfx2/source/dialog/versdlg.cxx
View File

@ -36,8 +36,6 @@
#include <vcl/msgbox.hxx> #include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <tools/datetime.hxx> #include <tools/datetime.hxx>
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include "versdlg.hrc" #include "versdlg.hrc"

2
sfx2/source/doc/docfile.cxx
View File

@ -89,8 +89,6 @@
#include <svtools/svparser.hxx> // SvKeyValue #include <svtools/svparser.hxx> // SvKeyValue
#include <cppuhelper/weakref.hxx> #include <cppuhelper/weakref.hxx>
#include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase1.hxx>
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <unotools/streamwrap.hxx> #include <unotools/streamwrap.hxx>

3
sfx2/source/doc/docinsert.cxx
View File

@ -26,7 +26,6 @@
* *
************************************************************************/ ************************************************************************/
#include <sfx2/app.hxx> #include <sfx2/app.hxx>
#include "sfx2/docinsert.hxx" #include "sfx2/docinsert.hxx"
#include <sfx2/docfile.hxx> #include <sfx2/docfile.hxx>
@ -48,8 +47,6 @@
#include <svl/eitem.hxx> #include <svl/eitem.hxx>
#include <svl/intitem.hxx> #include <svl/intitem.hxx>
#include <svl/stritem.hxx> #include <svl/stritem.hxx>
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
using namespace ::com::sun::star; using namespace ::com::sun::star;

1
sfx2/source/doc/docvor.cxx
View File

@ -72,7 +72,6 @@
#include <svtools/localresaccess.hxx> #include <svtools/localresaccess.hxx>
#include <svtools/addresstemplate.hxx> #include <svtools/addresstemplate.hxx>
#include <comphelper/processfactory.hxx> #include <comphelper/processfactory.hxx>
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
static const char cDelim = ':'; static const char cDelim = ':';

2
sfx2/source/menu/mnumgr.cxx
View File

@ -26,7 +26,6 @@
* *
************************************************************************/ ************************************************************************/
#include <com/sun/star/embed/VerbDescriptor.hpp> #include <com/sun/star/embed/VerbDescriptor.hpp>
#include <com/sun/star/embed/VerbAttributes.hpp> #include <com/sun/star/embed/VerbAttributes.hpp>
#include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/container/XNamed.hpp>
@ -57,7 +56,6 @@
#include <sfx2/mnumgr.hxx> #include <sfx2/mnumgr.hxx>
#define _SVSTDARR_USHORTS
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <svtools/menuoptions.hxx> #include <svtools/menuoptions.hxx>

5
svl/source/items/style.cxx
View File

@ -26,13 +26,8 @@
* *
************************************************************************/ ************************************************************************/
#include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XComponent.hpp>
#define _SVSTDARR_STRINGSSORTDTOR
#define _SVSTDARR_BYTESTRINGS
#define _SVSTDARR_BYTESTRINGSSORTDTOR
#include <tools/tenccvt.hxx> #include <tools/tenccvt.hxx>
#include <comphelper/processfactory.hxx> #include <comphelper/processfactory.hxx>
#include <unotools/intlwrapper.hxx> #include <unotools/intlwrapper.hxx>

15
svl/source/memtools/svarray.cxx
View File

@ -26,24 +26,9 @@
* *
************************************************************************/ ************************************************************************/
#define _SVARRAY_CXX
#define _SVSTDARR_sal_uInt16S
#define _SVSTDARR_STRINGSDTOR #define _SVSTDARR_STRINGSDTOR
#define _SVSTDARR_STRINGSSORT
#define _SVSTDARR_STRINGSSORTDTOR #define _SVSTDARR_STRINGSSORTDTOR
#define _SVSTDARR_STRINGSISORT #define _SVSTDARR_STRINGSISORT
#define _SVSTDARR_STRINGSISORTDTOR
#define _SVSTDARR_BYTESTRINGS
#define _SVSTDARR_BYTESTRINGSDTOR
#define _SVSTDARR_BYTESTRINGSSORT
#define _SVSTDARR_BYTESTRINGSSORTDTOR
#define _SVSTDARR_BYTESTRINGSISORT
#define _SVSTDARR_BYTESTRINGSISORTDTOR
#define _SVSTDARR_XUB_STRLEN
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <tools/debug.hxx> #include <tools/debug.hxx>

6
svl/source/misc/inettype.cxx
View File

@ -36,12 +36,6 @@
#include "getstringresource.hxx" #include "getstringresource.hxx"
#ifndef _SVSTDARR_STRINGSSORT_DECL
#define _SVSTDARR_STRINGSSORT
#include <svl/svstdarr.hxx>
#undef _SVSTDARR_STRINGSSORT
#endif
namespace namespace
{ {

2
svl/source/numbers/zforlist.cxx
View File

@ -26,7 +26,6 @@
* *
************************************************************************/ ************************************************************************/
#include <tools/debug.hxx> #include <tools/debug.hxx>
#include <unotools/charclass.hxx> #include <unotools/charclass.hxx>
#include <i18npool/mslangid.hxx> #include <i18npool/mslangid.hxx>
@ -38,7 +37,6 @@
#include <comphelper/processfactory.hxx> #include <comphelper/processfactory.hxx>
#include <unotools/misccfg.hxx> #include <unotools/misccfg.hxx>
#define _SVSTDARR_USHORTS
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#define _ZFORLIST_CXX #define _ZFORLIST_CXX

3
svtools/source/control/inettbc.cxx
View File

@ -26,7 +26,6 @@
* *
************************************************************************/ ************************************************************************/
#ifdef UNX #ifdef UNX
#include <pwd.h> #include <pwd.h>
#include <sys/types.h> #include <sys/types.h>
@ -57,8 +56,6 @@
#include <svl/itemset.hxx> #include <svl/itemset.hxx>
#include "svl/urihelper.hxx" #include "svl/urihelper.hxx"
#include <unotools/pathoptions.hxx> #include <unotools/pathoptions.hxx>
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <ucbhelper/commandenvironment.hxx> #include <ucbhelper/commandenvironment.hxx>
#include <ucbhelper/content.hxx> #include <ucbhelper/content.hxx>

2
svtools/source/svrtf/svparser.cxx
View File

@ -26,12 +26,10 @@
* *
************************************************************************/ ************************************************************************/
#include <stdio.h> #include <stdio.h>
#include <svtools/svparser.hxx> #include <svtools/svparser.hxx>
#include <tools/stream.hxx> #include <tools/stream.hxx>
#include <tools/debug.hxx> #include <tools/debug.hxx>
#define _SVSTDARR_USHORTS
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <rtl/textcvt.h> #include <rtl/textcvt.h>
#include <rtl/tencinfo.h> #include <rtl/tencinfo.h>

6
svx/inc/svx/fmsearch.hxx
View File

@ -30,16 +30,10 @@
#define _FMSEARCH_HXX #define _FMSEARCH_HXX
#include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/sdbc/XResultSet.hpp>
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <vcl/dialog.hxx> #include <vcl/dialog.hxx>
#include <vcl/button.hxx> #include <vcl/button.hxx>
#include <vcl/fixed.hxx> #include <vcl/fixed.hxx>
#include <vcl/edit.hxx> #include <vcl/edit.hxx>
#include <vcl/combobox.hxx> #include <vcl/combobox.hxx>
#include <vcl/lstbox.hxx> #include <vcl/lstbox.hxx>

7
svx/inc/svx/srchdlg.hxx
View File

@ -28,9 +28,6 @@
#ifndef _SVX_SRCHDLG_HXX #ifndef _SVX_SRCHDLG_HXX
#define _SVX_SRCHDLG_HXX #define _SVX_SRCHDLG_HXX
// include ---------------------------------------------------------------
#include <svtools/stdctrl.hxx> #include <svtools/stdctrl.hxx>
#include <vcl/combobox.hxx> #include <vcl/combobox.hxx>
#include <vcl/edit.hxx> #include <vcl/edit.hxx>
@ -42,15 +39,11 @@
#include <sfx2/childwin.hxx> #include <sfx2/childwin.hxx>
#include <sfx2/basedlgs.hxx> #include <sfx2/basedlgs.hxx>
#include <svl/svarray.hxx> #include <svl/svarray.hxx>
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <svtools/svmedit.hxx> #include <svtools/svmedit.hxx>
#include <svl/srchdefs.hxx> #include <svl/srchdefs.hxx>
#include "svx/svxdllapi.h" #include "svx/svxdllapi.h"
// forward ---------------------------------------------------------------
class SvxSearchItem; class SvxSearchItem;
class MoreButton; class MoreButton;
class SfxStyleSheetBasePool; class SfxStyleSheetBasePool;

7
svx/source/dialog/fntctrl.cxx
View File

@ -26,8 +26,6 @@
* *
************************************************************************/ ************************************************************************/
// include ---------------------------------------------------------------
#include <sfx2/viewsh.hxx> // SfxViewShell #include <sfx2/viewsh.hxx> // SfxViewShell
#include <sfx2/printer.hxx> // Printer #include <sfx2/printer.hxx> // Printer
#include <vcl/metric.hxx> #include <vcl/metric.hxx>
@ -40,10 +38,6 @@
#include <com/sun/star/i18n/ScriptType.hdl> #include <com/sun/star/i18n/ScriptType.hdl>
#ifndef _SVSTDARR_HXX
#define _SVSTDARR_XUB_STRLEN
#include <svl/svstdarr.hxx>
#endif
#include <vector> #include <vector>
#include <svtools/colorcfg.hxx> #include <svtools/colorcfg.hxx>
#include <svtools/sampletext.hxx> #include <svtools/sampletext.hxx>
@ -57,6 +51,7 @@
#include <svl/itempool.hxx> #include <svl/itempool.hxx>
#include <svl/stritem.hxx> // SfxStringItem #include <svl/stritem.hxx> // SfxStringItem
#include <svl/languageoptions.hxx> #include <svl/languageoptions.hxx>
#include <svl/svstdarr.hxx>
#include <editeng/colritem.hxx> #include <editeng/colritem.hxx>
#include <editeng/fontitem.hxx> #include <editeng/fontitem.hxx>

7
svx/source/fmcomp/fmgridcl.cxx
View File

@ -26,7 +26,6 @@
* *
************************************************************************/ ************************************************************************/
#include "svx/dbexch.hrc" #include "svx/dbexch.hrc"
#include "svx/fmgridif.hxx" #include "svx/fmgridif.hxx"
#include "fmitems.hxx" #include "fmitems.hxx"
@ -63,13 +62,7 @@
#include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/view/XSelectionSupplier.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp>
#ifndef _SVSTDARR_STRINGSDTOR
#define _SVSTDARR_STRINGSDTOR
#define _SVSTDARR_ULONGS
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#endif
#include <comphelper/extract.hxx> #include <comphelper/extract.hxx>
#include <comphelper/numbers.hxx> #include <comphelper/numbers.hxx>
#include <comphelper/processfactory.hxx> #include <comphelper/processfactory.hxx>

1
svx/source/form/fmexch.cxx
View File

@ -36,7 +36,6 @@
#include <svtools/svtreebx.hxx> #include <svtools/svtreebx.hxx>
#include <tools/diagnose_ex.h> #include <tools/diagnose_ex.h>
#define _SVSTDARR_ULONGS
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
//........................................................................ //........................................................................

2
svx/source/inc/fmshimp.hxx
View File

@ -56,8 +56,6 @@
#include <svl/svarray.hxx> #include <svl/svarray.hxx>
#include <svl/lstner.hxx> #include <svl/lstner.hxx>
#define _SVSTDARR_ULONGS
#define _SVSTDARR_USHORTS
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <sfx2/mnuitem.hxx> #include <sfx2/mnuitem.hxx>
#include "svx/fmtools.hxx" #include "svx/fmtools.hxx"

3
svx/source/items/clipfmtitem.cxx
View File

@ -26,9 +26,6 @@
* *
************************************************************************/ ************************************************************************/
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <svx/clipfmtitem.hxx> #include <svx/clipfmtitem.hxx>
#include <com/sun/star/frame/status/ClipboardFormats.hpp> #include <com/sun/star/frame/status/ClipboardFormats.hpp>

3
svx/source/items/numfmtsh.cxx
View File

@ -26,12 +26,9 @@
* *
************************************************************************/ ************************************************************************/
// include ---------------------------------------------------------------
#include <tools/color.hxx> #include <tools/color.hxx>
#define _SVX_NUMFMTSH_CXX #define _SVX_NUMFMTSH_CXX
#define _SVSTDARR_STRINGSDTOR
#include <tools/debug.hxx> #include <tools/debug.hxx>
#include <i18npool/mslangid.hxx> #include <i18npool/mslangid.hxx>

2
sw/inc/acmplwrd.hxx
View File

@ -28,8 +28,6 @@
#ifndef _ACMPLWRD_HXX #ifndef _ACMPLWRD_HXX
#define _ACMPLWRD_HXX #define _ACMPLWRD_HXX
#define _SVSTDARR_STRINGSISORTDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
class SwDoc; class SwDoc;

1
sw/inc/doc.hxx
View File

@ -53,7 +53,6 @@
class SwList; class SwList;
#include <IDocumentExternalData.hxx> #include <IDocumentExternalData.hxx>
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/embed/XStorage.hpp>

3
sw/inc/docstyle.hxx
View File

@ -30,10 +30,7 @@
#include <rtl/ref.hxx> #include <rtl/ref.hxx>
#ifndef _SVSTDARR_HXX
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#endif
#include <svl/style.hxx> #include <svl/style.hxx>
#include <svl/itemset.hxx> #include <svl/itemset.hxx>
#include "swdllapi.h" #include "swdllapi.h"

6
sw/inc/shellres.hxx
View File

@ -28,15 +28,9 @@
#ifndef _SHELLRES_HXX #ifndef _SHELLRES_HXX
#define _SHELLRES_HXX #define _SHELLRES_HXX
#include <tools/string.hxx> #include <tools/string.hxx>
#include <vcl/bitmap.hxx> #include <vcl/bitmap.hxx>
#ifndef _SVSTDARR_HXX
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#endif
struct SW_DLLPUBLIC ShellResource : public Resource struct SW_DLLPUBLIC ShellResource : public Resource
{ {

3
sw/source/core/doc/SwStyleNameMapper.cxx
View File

@ -26,10 +26,7 @@
* *
************************************************************************/ ************************************************************************/
#include <SwStyleNameMapper.hxx> #include <SwStyleNameMapper.hxx>
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <tools/resmgr.hxx> #include <tools/resmgr.hxx>
#include <poolfmt.hxx> #include <poolfmt.hxx>

4
sw/source/core/doc/docfld.cxx
View File

@ -26,16 +26,12 @@
* *
************************************************************************/ ************************************************************************/
#include <hintids.hxx> #include <hintids.hxx>
#include <string.h> #include <string.h>
#include <float.h> #include <float.h>
#include <tools/datetime.hxx> #include <tools/datetime.hxx>
#ifndef _SVSTDARR_HXX
#include <svl/svarray.hxx> #include <svl/svarray.hxx>
#endif
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <unotools/charclass.hxx> #include <unotools/charclass.hxx>
#include <unotools/transliterationwrapper.hxx> #include <unotools/transliterationwrapper.hxx>

3
sw/source/core/doc/doctxm.cxx
View File

@ -26,12 +26,9 @@
* *
************************************************************************/ ************************************************************************/
#include <limits.h> #include <limits.h>
#include <hintids.hxx> #include <hintids.hxx>
#include <comphelper/string.hxx> #include <comphelper/string.hxx>
#define _SVSTDARR_STRINGSSORT
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <editeng/langitem.hxx> #include <editeng/langitem.hxx>
#include <editeng/brkitem.hxx> #include <editeng/brkitem.hxx>

2
sw/source/core/edit/edtab.cxx
View File

@ -26,12 +26,10 @@
* *
************************************************************************/ ************************************************************************/
#include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/chart2/XChartDocument.hpp>
#include <hintids.hxx> #include <hintids.hxx>
#include <hints.hxx> #include <hints.hxx>
#define _SVSTDARR_ULONGS
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>

5
sw/source/core/fields/authfld.cxx
View File

@ -26,11 +26,6 @@
* *
************************************************************************/ ************************************************************************/
#define _SVSTDARR_STRINGSDTOR
#define _SVSTDARR_USHORTS
#define _SVSTDARR_ULONGS
#include <hintids.hxx> #include <hintids.hxx>
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>

5
sw/source/core/inc/UndoAttribute.hxx
View File

@ -33,11 +33,6 @@
#include <memory> #include <memory>
#ifndef _SVSTDARR_HXX
#define _SVSTDARR_USHORTS
#define _SVSTDARR_ULONGS
#include <svl/svstdarr.hxx>
#endif
#include <svl/itemset.hxx> #include <svl/itemset.hxx>
#include <swtypes.hxx> #include <swtypes.hxx>

5
sw/source/core/inc/scriptinfo.hxx
View File

@ -27,11 +27,8 @@
************************************************************************/ ************************************************************************/
#ifndef _SCRIPTINFO_HXX #ifndef _SCRIPTINFO_HXX
#define _SCRIPTINFO_HXX #define _SCRIPTINFO_HXX
#ifndef _SVSTDARR_HXX
#define _SVSTDARR_USHORTS
#define _SVSTDARR_XUB_STRLEN
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#endif
#include <list> #include <list>
#include "swscanner.hxx" #include "swscanner.hxx"

5
sw/source/core/inc/swcache.hxx
View File

@ -28,8 +28,6 @@
#ifndef _SWCACHE_HXX #ifndef _SWCACHE_HXX
#define _SWCACHE_HXX #define _SWCACHE_HXX
/* /*
* Es werden Pointer auf Objekte verwaltet. Diese werden in einem einfachen * Es werden Pointer auf Objekte verwaltet. Diese werden in einem einfachen
* PtrArray verwaltet. * PtrArray verwaltet.
@ -59,10 +57,7 @@
*/ */
#include <vector> #include <vector>
#ifndef _SVSTDARR_HXX
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#endif
class SwCacheObj; class SwCacheObj;

6
sw/source/core/layout/dbg_lay.cxx
View File

@ -26,7 +26,6 @@
* *
************************************************************************/ ************************************************************************/
#ifdef DBG_UTIL #ifdef DBG_UTIL
/* /*
@ -107,11 +106,6 @@
#include "dbg_lay.hxx" #include "dbg_lay.hxx"
#include <tools/stream.hxx> #include <tools/stream.hxx>
#ifndef _SVSTDARR_HXX
#define _SVSTDARR_USHORTS
#include <svl/svstdarr.hxx>
#endif
#include <stdio.h> #include <stdio.h>
#include "frame.hxx" #include "frame.hxx"

4
sw/source/core/layout/layhelp.hxx
View File

@ -27,10 +27,8 @@
************************************************************************/ ************************************************************************/
#ifndef _LAYHELP_HXX #ifndef _LAYHELP_HXX
#define _LAYHELP_HXX #define _LAYHELP_HXX
#ifndef _SVSTDARR_HXX
#define _SVSTDARR_XUB_STRLEN
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#endif
#include <swrect.hxx> #include <swrect.hxx>
#include <vector> #include <vector>

7
sw/source/core/sw3io/sw3convert.cxx
View File

@ -26,9 +26,6 @@
* *
************************************************************************/ ************************************************************************/
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
@ -40,10 +37,6 @@
#include <svl/urihelper.hxx> #include <svl/urihelper.hxx>
#include <sfx2/linkmgr.hxx> #include <sfx2/linkmgr.hxx>
#ifndef _SVSTDARR_USHORTS_DECL
#define _SVSTDARR_USHORTS
#include <svl/svstdarr.hxx>
#endif
#include <editeng/lrspitem.hxx> #include <editeng/lrspitem.hxx>
#include <editeng/tstpitem.hxx> #include <editeng/tstpitem.hxx>
#include <fmtinfmt.hxx> #include <fmtinfmt.hxx>

2
sw/source/core/text/itratr.hxx
View File

@ -33,8 +33,6 @@
#include "swfont.hxx" #include "swfont.hxx"
#include "porlay.hxx" #include "porlay.hxx"
#define _SVSTDARR_XUB_STRLEN
#define _SVSTDARR_USHORTS
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
class OutputDevice; class OutputDevice;

4
sw/source/core/txtnode/atrftn.cxx
View File

@ -26,10 +26,6 @@
* *
************************************************************************/ ************************************************************************/
#define _SVSTDARR_USHORTS
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <doc.hxx> #include <doc.hxx>
#include <cntfrm.hxx> // OSL_ENSURE(in ~SwTxtFtn() #include <cntfrm.hxx> // OSL_ENSURE(in ~SwTxtFtn()

2
sw/source/core/txtnode/ndtxt.cxx
View File

@ -36,9 +36,7 @@
#include <editeng/rsiditem.hxx> #include <editeng/rsiditem.hxx>
#include <editeng/tstpitem.hxx> #include <editeng/tstpitem.hxx>
#include <svl/urihelper.hxx> #include <svl/urihelper.hxx>
#ifndef _SVSTDARR_HXX
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#endif
#include <svl/ctloptions.hxx> #include <svl/ctloptions.hxx>
#include <swmodule.hxx> #include <swmodule.hxx>
#include <txtfld.hxx> #include <txtfld.hxx>

2
sw/source/core/unocore/unocrsrhelper.cxx
View File

@ -26,7 +26,6 @@
* *
************************************************************************/ ************************************************************************/
#include <svx/svxids.hrc> #include <svx/svxids.hrc>
#include <map> #include <map>
#include <com/sun/star/text/XTextSection.hpp> #include <com/sun/star/text/XTextSection.hpp>
@ -68,7 +67,6 @@
#include <editeng/flstitem.hxx> #include <editeng/flstitem.hxx>
#include <vcl/metric.hxx> #include <vcl/metric.hxx>
#include <svtools/ctrltool.hxx> #include <svtools/ctrltool.hxx>
#define _SVSTDARR_USHORTS
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <sfx2/docfilt.hxx> #include <sfx2/docfilt.hxx>
#include <sfx2/docfile.hxx> #include <sfx2/docfile.hxx>

2
sw/source/core/unocore/unoobj.cxx
View File

@ -26,7 +26,6 @@
* *
************************************************************************/ ************************************************************************/
#include <com/sun/star/table/TableSortField.hpp> #include <com/sun/star/table/TableSortField.hpp>
#include <osl/endian.h> #include <osl/endian.h>
@ -107,7 +106,6 @@
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <fmtflcnt.hxx> #include <fmtflcnt.hxx>
#define _SVSTDARR_USHORTS
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <editeng/brshitem.hxx> #include <editeng/brshitem.hxx>
#include <editeng/unolingu.hxx> #include <editeng/unolingu.hxx>

3
sw/source/core/unocore/unoobj2.cxx
View File

@ -26,7 +26,6 @@
* *
************************************************************************/ ************************************************************************/
#include <rtl/ustrbuf.hxx> #include <rtl/ustrbuf.hxx>
#include <swtypes.hxx> #include <swtypes.hxx>
#include <hintids.hxx> #include <hintids.hxx>
@ -106,8 +105,6 @@
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <fmtflcnt.hxx> #include <fmtflcnt.hxx>
#define _SVSTDARR_USHORTS
#define _SVSTDARR_XUB_STRLEN
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <editeng/brshitem.hxx> #include <editeng/brshitem.hxx>
#include <fmtclds.hxx> #include <fmtclds.hxx>

2
sw/source/core/unocore/unoparagraph.cxx
View File

@ -26,7 +26,6 @@
* *
************************************************************************/ ************************************************************************/
#include <unoparagraph.hxx> #include <unoparagraph.hxx>
#include <cmdid.h> #include <cmdid.h>
#include <unomid.h> #include <unomid.h>
@ -44,7 +43,6 @@
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <docsh.hxx> #include <docsh.hxx>
#define _SVSTDARR_USHORTS
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <com/sun/star/beans/SetPropertyTolerantFailed.hpp> #include <com/sun/star/beans/SetPropertyTolerantFailed.hpp>

3
sw/source/filter/ascii/ascatr.cxx
View File

@ -29,10 +29,7 @@
#include <hintids.hxx> #include <hintids.hxx>
#include <tools/stream.hxx> #include <tools/stream.hxx>
#include <comphelper/string.hxx> #include <comphelper/string.hxx>
#ifndef _SVSTDARR_HXX
#define _SVSTDARR_USHORTS
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#endif
#include <editeng/fontitem.hxx> #include <editeng/fontitem.hxx>
#include <pam.hxx> #include <pam.hxx>
#include <doc.hxx> #include <doc.hxx>

7
sw/source/filter/html/htmlatr.cxx
View File

@ -26,18 +26,11 @@
* *
************************************************************************/ ************************************************************************/
#include <hintids.hxx> #include <hintids.hxx>
#include <com/sun/star/i18n/ScriptType.hpp> #include <com/sun/star/i18n/ScriptType.hpp>
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <vcl/wrkwin.hxx> #include <vcl/wrkwin.hxx>
#include <sfx2/sfx.hrc> #include <sfx2/sfx.hrc>
#if !defined _SVSTDARR_XUB_STRLEN_DECL || !defined _SVSTDARR_USHORTS_DECL
#define _SVSTDARR_XUB_STRLEN
#define _SVSTDARR_USHORTS
#include <svl/svstdarr.hxx>
#endif
#include <svtools/htmlout.hxx> #include <svtools/htmlout.hxx>
#include <svtools/htmlkywd.hxx> #include <svtools/htmlkywd.hxx>
#include <svtools/htmltokn.h> #include <svtools/htmltokn.h>

2
sw/source/filter/html/htmlbas.cxx
View File

@ -26,11 +26,9 @@
* *
************************************************************************/ ************************************************************************/
#include <hintids.hxx> #include <hintids.hxx>
#include <rtl/strbuf.hxx> #include <rtl/strbuf.hxx>
#include <sfx2/sfx.hrc> #include <sfx2/sfx.hrc>
#define _SVSTDARR_STRINGSSORTDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <basic/sbx.hxx> #include <basic/sbx.hxx>
#include <basic/basmgr.hxx> #include <basic/basmgr.hxx>

1
sw/source/filter/html/htmlplug.cxx
View File

@ -32,7 +32,6 @@
#include "hintids.hxx" #include "hintids.hxx"
#include <rtl/strbuf.hxx> #include <rtl/strbuf.hxx>
#include <svl/urihelper.hxx> #include <svl/urihelper.hxx>
#define _SVSTDARR_ULONGS
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <sfx2/frmhtml.hxx> #include <sfx2/frmhtml.hxx>

5
sw/source/filter/html/svxcss1.hxx
View File

@ -31,11 +31,6 @@
#include <tools/string.hxx> #include <tools/string.hxx>
#include <svl/itemset.hxx> #include <svl/itemset.hxx>
#include <editeng/svxenum.hxx> #include <editeng/svxenum.hxx>
#ifndef _SVSTDARR_HXX
#define _SVSTDARR_USHORTS
#include <svl/svstdarr.hxx>
#endif
#include <rtl/textenc.h> #include <rtl/textenc.h>
#include "parcss1.hxx" #include "parcss1.hxx"

9
sw/source/filter/html/swhtml.hxx
View File

@ -28,16 +28,7 @@
#ifndef _SWHTML_HXX #ifndef _SWHTML_HXX
#define _SWHTML_HXX #define _SWHTML_HXX
#if !defined(_SVSTDARR_XUB_STRLEN_DECL) || \
!defined(_SVSTDARR_USHORTS_DECL) || !defined(_SVSTDARR_STRINGSDTOR_DECL)
#ifndef _SVSTDARR_XUB_STRLEN_DECL
#define _SVSTDARR_XUB_STRLEN
#endif
#ifndef _SVSTDARR_STRINGSDTOR_DECL
#define _SVSTDARR_STRINGSDTOR
#endif
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#endif
#include <sfx2/sfxhtml.hxx> #include <sfx2/sfxhtml.hxx>
#include <svl/macitem.hxx> #include <svl/macitem.hxx>
#include <editeng/svxenum.hxx> #include <editeng/svxenum.hxx>

2
sw/source/filter/html/wrthtml.hxx
View File

@ -34,8 +34,6 @@
#include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/container/XIndexContainer.hpp>
#include <com/sun/star/form/XForm.hpp> #include <com/sun/star/form/XForm.hpp>
#include <vcl/field.hxx> #include <vcl/field.hxx>
#define _SVSTDARR_STRINGSDTOR
#define _SVSTDARR_STRINGSSORTDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <i18npool/lang.h> #include <i18npool/lang.h>
#include <tools/stream.hxx> #include <tools/stream.hxx>

2
sw/source/filter/writer/writer.cxx
View File

@ -26,10 +26,8 @@
* *
************************************************************************/ ************************************************************************/
#include <hintids.hxx> #include <hintids.hxx>
#define _SVSTDARR_STRINGSSORTDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <tools/table.hxx> #include <tools/table.hxx>

2
sw/source/filter/ww8/wrtw8esh.cxx
View File

@ -28,10 +28,8 @@
#include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/embed/Aspects.hpp>
#include <hintids.hxx> #include <hintids.hxx>
#define _SVSTDARR_USHORTS
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <vcl/cvtgrf.hxx> #include <vcl/cvtgrf.hxx>
#include <vcl/virdev.hxx> #include <vcl/virdev.hxx>

8
sw/source/filter/xml/xmlexpit.cxx
View File

@ -26,7 +26,6 @@
* *
************************************************************************/ ************************************************************************/
#include "xmlexpit.hxx" #include "xmlexpit.hxx"
#include <rtl/ustrbuf.hxx> #include <rtl/ustrbuf.hxx>
@ -41,13 +40,6 @@
#include <editeng/xmlcnitm.hxx> #include <editeng/xmlcnitm.hxx>
#include <xmloff/xmlexp.hxx> #include <xmloff/xmlexp.hxx>
#include <editeng/memberids.hrc> #include <editeng/memberids.hrc>
#ifndef _SVSTDARR_USHORTS
#define _SVSTDARR_USHORTS
#include <svl/svstdarr.hxx>
#endif
#include "hintids.hxx" #include "hintids.hxx"
#include "unomid.h" #include "unomid.h"
#include <svx/unomid.hxx> #include <svx/unomid.hxx>

6
sw/source/filter/xml/xmlfmt.cxx
View File

@ -26,14 +26,8 @@
* *
************************************************************************/ ************************************************************************/
#include <rtl/ustrbuf.hxx> #include <rtl/ustrbuf.hxx>
#ifndef _SVSTDARR_STRINGSSORT_DECL
#define _SVSTDARR_STRINGSSORT
#include <svl/svstdarr.hxx>
#endif
#include <xmloff/nmspmap.hxx> #include <xmloff/nmspmap.hxx>
#include <format.hxx> #include <format.hxx>
#include <fmtcol.hxx> #include <fmtcol.hxx>

5
sw/source/filter/xml/xmltbli.hxx
View File

@ -34,12 +34,7 @@
// STL include // STL include
#include <boost/unordered_map.hpp> #include <boost/unordered_map.hpp>
#include <vector> #include <vector>
#if !defined(_SVSTDARR_USHORTS_DECL) || !defined(_SVSTDARR_STRINGSDTOR_DECL)
#define _SVSTDARR_USHORTS
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#endif
class SwXMLImport; class SwXMLImport;
class SwTableNode; class SwTableNode;

3
sw/source/filter/xml/xmltexte.cxx
View File

@ -26,7 +26,6 @@
* *
************************************************************************/ ************************************************************************/
#include <sot/clsids.hxx> #include <sot/clsids.hxx>
#include <com/sun/star/embed/XEmbedObjectCreator.hpp> #include <com/sun/star/embed/XEmbedObjectCreator.hpp>
#include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/embed/XEmbeddedObject.hpp>
@ -52,13 +51,11 @@
#include "xmltexte.hxx" #include "xmltexte.hxx"
#include <SwAppletImpl.hxx> #include <SwAppletImpl.hxx>
#define _SVSTDARR_ULONGS
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include "svl/urihelper.hxx" #include "svl/urihelper.hxx"
#include <sfx2/frmdescr.hxx> #include <sfx2/frmdescr.hxx>
#include <SwStyleNameMapper.hxx> #include <SwStyleNameMapper.hxx>
using ::rtl::OUString; using ::rtl::OUString;
using ::rtl::OUStringBuffer; using ::rtl::OUStringBuffer;
using namespace ::com::sun::star; using namespace ::com::sun::star;

3
sw/source/ui/app/apphdl.cxx
View File

@ -26,13 +26,10 @@
* *
************************************************************************/ ************************************************************************/
#include <hintids.hxx> #include <hintids.hxx>
#include <osl/diagnose.h> #include <osl/diagnose.h>
#include <tools/link.hxx> #include <tools/link.hxx>
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <svl/urihelper.hxx> #include <svl/urihelper.hxx>
#include <unotools/undoopt.hxx> #include <unotools/undoopt.hxx>

1
sw/source/ui/app/appopt.cxx
View File

@ -28,7 +28,6 @@
#include <cmdid.h> // Function-Ids #include <cmdid.h> // Function-Ids
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <com/sun/star/i18n/ScriptType.hpp> #include <com/sun/star/i18n/ScriptType.hpp>

3
sw/source/ui/chrdlg/drpcps.cxx
View File

@ -31,9 +31,6 @@
#endif #endif
#include <hintids.hxx> #include <hintids.hxx>
#define _SVSTDARR_STRINGSDTOR
#define _SVSTDARR_STRINGSISORTDTOR
#define _SVSTDARR_XUB_STRLEN
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include "cmdid.h" #include "cmdid.h"

7
sw/source/ui/chrdlg/pardlg.cxx
View File

@ -26,22 +26,15 @@
* *
************************************************************************/ ************************************************************************/
#ifdef SW_DLLIMPLEMENTATION #ifdef SW_DLLIMPLEMENTATION
#undef SW_DLLIMPLEMENTATION #undef SW_DLLIMPLEMENTATION
#endif #endif
#include "hintids.hxx" #include "hintids.hxx"
#include <svx/htmlmode.hxx> #include <svx/htmlmode.hxx>
#include <svl/style.hxx> #include <svl/style.hxx>
#include <svtools/htmlcfg.hxx> #include <svtools/htmlcfg.hxx>
#ifndef _SVSTDARR_STRINGSSORTDTOR
#define _SVSTDARR_STRINGSSORTDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#endif
#include <svl/cjkoptions.hxx> #include <svl/cjkoptions.hxx>
#include "docsh.hxx" #include "docsh.hxx"
#include "wrtsh.hxx" #include "wrtsh.hxx"

5
sw/source/ui/config/optpage.cxx
View File

@ -26,16 +26,11 @@
* *
************************************************************************/ ************************************************************************/
#ifdef SW_DLLIMPLEMENTATION #ifdef SW_DLLIMPLEMENTATION
#undef SW_DLLIMPLEMENTATION #undef SW_DLLIMPLEMENTATION
#endif #endif
#ifndef _SVSTDARR_HXX
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#endif
#include <optpage.hxx> #include <optpage.hxx>
#include <doc.hxx> #include <doc.hxx>
#include <hintids.hxx> #include <hintids.hxx>

1
sw/source/ui/dbui/dbmgr.cxx
View File

@ -59,7 +59,6 @@
#include <unotools/tempfile.hxx> #include <unotools/tempfile.hxx>
#include <unotools/pathoptions.hxx> #include <unotools/pathoptions.hxx>
#include <svl/urihelper.hxx> #include <svl/urihelper.hxx>
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <svl/zforlist.hxx> #include <svl/zforlist.hxx>
#include <svl/zformat.hxx> #include <svl/zformat.hxx>

3
sw/source/ui/dbui/mmconfigitem.cxx
View File

@ -51,10 +51,7 @@
#include <wrtsh.hxx> #include <wrtsh.hxx>
#include <dbui.hrc> #include <dbui.hrc>
#include <vector> #include <vector>
#include <unomid.h> #include <unomid.h>
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
using namespace utl; using namespace utl;

3
sw/source/ui/dialog/macassgn.cxx
View File

@ -26,15 +26,12 @@
* *
************************************************************************/ ************************************************************************/
#ifdef SW_DLLIMPLEMENTATION #ifdef SW_DLLIMPLEMENTATION
#undef SW_DLLIMPLEMENTATION #undef SW_DLLIMPLEMENTATION
#endif #endif
#include "hintids.hxx" #include "hintids.hxx"
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <svx/htmlmode.hxx> #include <svx/htmlmode.hxx>
#include <svx/svxids.hrc> #include <svx/svxids.hrc>

5
sw/source/ui/fmtui/tmpdlg.cxx
View File

@ -26,18 +26,13 @@
* *
************************************************************************/ ************************************************************************/
#ifdef SW_DLLIMPLEMENTATION #ifdef SW_DLLIMPLEMENTATION
#undef SW_DLLIMPLEMENTATION #undef SW_DLLIMPLEMENTATION
#endif #endif
#include <hintids.hxx> #include <hintids.hxx>
#ifndef _SVSTDARR_STRINGSSORTDTOR
#define _SVSTDARR_STRINGSSORTDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#endif
#include <vcl/msgbox.hxx> #include <vcl/msgbox.hxx>
#include <sfx2/viewfrm.hxx> #include <sfx2/viewfrm.hxx>
#include <svx/hdft.hxx> #include <svx/hdft.hxx>

2
sw/source/ui/inc/basesh.hxx
View File

@ -28,10 +28,8 @@
#ifndef _SWBASESH_HXX #ifndef _SWBASESH_HXX
#define _SWBASESH_HXX #define _SWBASESH_HXX
#include <shellid.hxx> #include <shellid.hxx>
#define _SVSTDARR_USHORTS
#include <tools/link.hxx> #include <tools/link.hxx>
#include <vcl/timer.hxx> #include <vcl/timer.hxx>
#include <sfx2/module.hxx> #include <sfx2/module.hxx>

1
sw/source/ui/inc/edtwin.hxx
View File

@ -37,7 +37,6 @@
#include <svtools/transfer.hxx> #include <svtools/transfer.hxx>
#include <swevent.hxx> #include <swevent.hxx>
#define _SVSTDARR_STRINGSISORTDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
class SwWrtShell; class SwWrtShell;

4
sw/source/ui/inc/fldmgr.hxx
View File

@ -27,10 +27,8 @@
************************************************************************/ ************************************************************************/
#ifndef _FLDMGR_HXX #ifndef _FLDMGR_HXX
#define _FLDMGR_HXX #define _FLDMGR_HXX
#ifndef _SVSTDARR_HXX
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#endif
#include <tools/string.hxx> #include <tools/string.hxx>
#include "swdllapi.h" #include "swdllapi.h"
#include "swtypes.hxx" #include "swtypes.hxx"

3
sw/source/ui/inc/label.hxx
View File

@ -28,10 +28,7 @@
#ifndef _LABEL_HXX #ifndef _LABEL_HXX
#define _LABEL_HXX #define _LABEL_HXX
#ifndef _SVSTDARR_HXX
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#endif
#include <sfx2/tabdlg.hxx> #include <sfx2/tabdlg.hxx>
#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/XModel.hpp>
#include <labelcfg.hxx> #include <labelcfg.hxx>

3
sw/source/ui/index/idxmrk.cxx
View File

@ -26,11 +26,8 @@
* *
************************************************************************/ ************************************************************************/
#include <hintids.hxx> #include <hintids.hxx>
#include <helpid.h> #include <helpid.h>
#define _SVSTDARR_STRINGSSORT
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <comphelper/processfactory.hxx> #include <comphelper/processfactory.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp>

Some files were not shown because too many files have changed in this diff Show More