diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-09 16:20:18 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-09 19:57:20 +0100 |
| commit | 553aed7b518599742189ffce50cd947dbf39a2e7 (patch) | |
| tree | cd8d0ae2e88760bb99b9318a71903d8ff535d862 /svx/source/mnuctrls | |
| parent | c824a1f69c093f38b82ead0f413c75b492a1f994 (diff) | |
Trying to remove the stlport mention from the code
Diffstat (limited to 'svx/source/mnuctrls')
| -rw-r--r-- | svx/source/mnuctrls/fntctl.cxx | 4 | ||||
| -rw-r--r-- | svx/source/mnuctrls/fntszctl.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
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> |