INTEGRATION: CWS dba31a (1.6.30); FILE MERGED

2008/06/26 14:26:33 oj 1.6.30.1: #i77916# impl zooming in report builder

reportdesign/source/ui/misc/toolboxcontroller.cxx

@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: toolboxcontroller.cxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -46,9 +46,7 @@
 #include <svtools/moduleoptions.hxx>
 #include <svtools/menuoptions.hxx>
 #include <vos/mutex.hxx>
-#ifndef _SBASLTID_HRC
 #include <svx/svxids.hrc>
-#endif
 #define ITEMID_COLOR        1
 #define ITEMID_BRUSH        2
 #define ITEMID_FONT         3