summaryrefslogtreecommitdiff
path: root/starmath/inc/toolbox.hxx
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2010-10-28 23:02:10 +0200
committerMathias Bauer <mba@openoffice.org>2010-10-28 23:02:10 +0200
commit0fe045d9566b66b766a8dd967e65ad6d57d78e5b (patch)
tree7a7506427f1225f68a2179fa9e40f9e013549ea4 /starmath/inc/toolbox.hxx
parent75999228ead62620ed8b9d3970277bf916af3d6d (diff)
parent8409cfd0c4842fae1e087f8c932748f9305871a8 (diff)
CWS gnumake: resync to m91; conflicts unresolved
Diffstat (limited to 'starmath/inc/toolbox.hxx')
-rw-r--r--starmath/inc/toolbox.hxx6
1 files changed, 2 insertions, 4 deletions
diff --git a/starmath/inc/toolbox.hxx b/starmath/inc/toolbox.hxx
index 1881adc0f845..fcc1b046f2dd 100644
--- a/starmath/inc/toolbox.hxx
+++ b/starmath/inc/toolbox.hxx
@@ -30,12 +30,10 @@
#include <sfx2/basedlgs.hxx>
#include <sfx2/childwin.hxx>
#include <vcl/toolbox.hxx>
+
#include "smmod.hxx"
#include "config.hxx"
-
-#include "dialog.hrc"
-
-#define NUM_TBX_CATEGORIES 9
+#include "toolbox.hrc"
class SmToolBoxWindow : public SfxFloatingWindow
{