diff options
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/customshapes/tbxcustomshapes.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/tbxform.cxx | 2 | ||||
-rw-r--r-- | svx/source/mnuctrls/fntctl.cxx | 4 | ||||
-rw-r--r-- | svx/source/mnuctrls/fntszctl.cxx | 2 | ||||
-rw-r--r-- | svx/source/tbxctrls/extrusioncontrols.cxx | 2 | ||||
-rw-r--r-- | svx/source/tbxctrls/fillctrl.cxx | 2 | ||||
-rw-r--r-- | svx/source/tbxctrls/grafctrl.cxx | 2 | ||||
-rw-r--r-- | svx/source/tbxctrls/layctrl.cxx | 2 | ||||
-rw-r--r-- | svx/source/tbxctrls/linectrl.cxx | 2 | ||||
-rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 2 | ||||
-rw-r--r-- | svx/source/tbxctrls/tbxdrctl.cxx | 2 |
11 files changed, 12 insertions, 12 deletions
diff --git a/svx/source/customshapes/tbxcustomshapes.cxx b/svx/source/customshapes/tbxcustomshapes.cxx index bcaf8a6f80ac..417554218c01 100644 --- a/svx/source/customshapes/tbxcustomshapes.cxx +++ b/svx/source/customshapes/tbxcustomshapes.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <string> // HACK: prevent conflict between STLPORT and Workshop headers +#include <string> #include <svx/svxids.hrc> #include <tools/shl.hxx> diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index 96c37148b166..e2956e405068 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <string> // HACK: prevent conflict between STLPORT and Workshop headers +#include <string> #include <tools/ref.hxx> #include <tools/shl.hxx> #include <svl/intitem.hxx> diff --git a/svx/source/mnuctrls/fntctl.cxx b/svx/source/mnuctrls/fntctl.cxx index d4a1577582c8..efc5672624ec 100644 --- a/svx/source/mnuctrls/fntctl.cxx +++ b/svx/source/mnuctrls/fntctl.cxx @@ -29,13 +29,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <string> // HACK: prevent conflict between STLPORT and Workshop headern +#include <string> #include <svtools/stdmenu.hxx> #include <sfx2/app.hxx> #include <sfx2/objsh.hxx> #include <sfx2/dispatch.hxx> -#include <svx/fntctl.hxx> // +#include <svx/fntctl.hxx> #include <svx/svxids.hrc> #include "editeng/flstitem.hxx" #include "editeng/fontitem.hxx" diff --git a/svx/source/mnuctrls/fntszctl.cxx b/svx/source/mnuctrls/fntszctl.cxx index 7cafe775c36f..67bdfac024f0 100644 --- a/svx/source/mnuctrls/fntszctl.cxx +++ b/svx/source/mnuctrls/fntszctl.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <string> // HACK: prevent conflict between STLPORT and Workshop headern +#include <string> #include <svl/itempool.hxx> #include <svtools/stdmenu.hxx> #include <svtools/ctrltool.hxx> diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 61dcededf870..c060405eb3b7 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <string> // HACK: prevent conflict between STLPORT and Workshop headers +#include <string> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/awt/MenuItemStyle.hpp> diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index f130c84f9741..2a168f90cc3a 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -31,7 +31,7 @@ // include --------------------------------------------------------------- -#include <string> // HACK: prevent conflict between STLPORT and Workshop headers +#include <string> #include <sfx2/app.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/objsh.hxx> diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 07827706f82e..0d0b579acb29 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <string> // HACK: prevent conflict between STLPORT and Workshop headers +#include <string> #include <vcl/toolbox.hxx> #include <vcl/field.hxx> diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index c3dc54e999e0..56366e9ddc60 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -31,7 +31,7 @@ // include --------------------------------------------------------------- -#include <string> // HACK: prevent conflict between STLPORT and Workshop headers +#include <string> #include <vcl/toolbox.hxx> #include <vcl/button.hxx> #include <svl/intitem.hxx> diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 76c3e51416ee..ac75947e1081 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -31,7 +31,7 @@ // include --------------------------------------------------------------- -#include <string> // HACK: prevent conflict between STLPORT and Workshop headers +#include <string> #include <vcl/toolbox.hxx> #include <sfx2/app.hxx> diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 58195689303a..4c7bfa7b03f3 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <string> // HACK: prevent conflict between STLPORT and Workshop headers +#include <string> #include <tools/shl.hxx> #include <svl/poolitem.hxx> #include <svl/eitem.hxx> diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx index a64810196af1..5dbe1fc08821 100644 --- a/svx/source/tbxctrls/tbxdrctl.cxx +++ b/svx/source/tbxctrls/tbxdrctl.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <string> // HACK: prevent conflict between STLPORT and Workshop headers +#include <string> #include <tools/ref.hxx> #include <tools/shl.hxx> |