#i106421#: cleanup of help ids

cui/source/dialogs/cuigaldlg.cxx

@@ -55,6 +55,7 @@
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/ucb/XContentAccess.hpp>
 #include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp>
+#include <sfx2/sfxuno.hxx>
 
 #include "gallery.hrc"
 

cui/source/factory/dlgfact.cxx

@@ -31,6 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_cui.hxx"
 
+#include "align.hxx" //add for SvxAlignmentTabPage
 #include "dlgfact.hxx"
 
 #include <tools/rc.hxx>
@@ -88,7 +89,6 @@
 #include "paragrph.hxx" //add for
 #include "tabstpge.hxx" // add  for
 #include "textattr.hxx" // add for SvxTextAttrPage
-#include "align.hxx" //add for SvxAlignmentTabPage
 #include "backgrnd.hxx" //add for SvxBackgroundTabPage
 #include "border.hxx" //add for SvxBorderTabPage
 #include "chardlg.hxx" //add for SvxCharNamePage,SvxCharEffectsPage,SvxCharPositionPage,SvxCharTwoLinesPage

cui/source/inc/align.hxx

@@ -32,6 +32,7 @@
 
 // include ---------------------------------------------------------------
 
+#include <svx/orienthelper.hxx>
 #include <vcl/field.hxx>
 #include <vcl/imagebtn.hxx>
 #include <vcl/fixed.hxx>
@@ -40,7 +41,6 @@
 #include <svtools/valueset.hxx>
 #include <svx/dialcontrol.hxx>
 #include <svx/wrapfield.hxx>
-#include <svx/orienthelper.hxx>
 #include <svx/frmdirlbox.hxx>
 
 namespace svx {

cui/source/options/internationaloptions.cxx

@@ -37,6 +37,7 @@
 #include <cuires.hrc>
 #include "helpid.hrc"
 #include <dialmgr.hxx>
+#include <svx/dialogs.hrc>
 
 namespace offapp
 {

cui/source/options/internationaloptions.src

@@ -31,6 +31,7 @@
 #include "internationaloptions.hrc"
 #include "helpid.hrc"
 #include <cuires.hrc>
+#include <svx/dialogs.hrc>
 
 TabPage RID_OFA_TP_INTERNATIONAL
 {

cui/source/tabpages/align.cxx

@@ -33,6 +33,8 @@
 
 // include ---------------------------------------------------------------
 
+#include "align.hxx"
+
 #include <svx/svxenum.hxx>
 #include <svx/dialogs.hrc>
 #include <cuires.hrc>
@@ -41,7 +43,6 @@
 
 #include <svx/algitem.hxx>
 #include <svx/frmdiritem.hxx>
-#include "align.hxx"
 #include <dialmgr.hxx>
 #include <svx/dlgutil.hxx>
 #include <tools/shl.hxx>

cui/util/makefile.mk

@@ -36,8 +36,6 @@ TARGET=cui
 GEN_HID=TRUE
 GEN_HID_OTHER=TRUE
 
-USE_DEFFILE=TRUE
-
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
@@ -49,9 +47,9 @@ LINKFLAGS+=-Wl,-LD_LAYOUT:lgot_buffer=30
 SHL1TARGET= cui$(DLLPOSTFIX)
 SHL1VERSIONMAP= cui.map
 SHL1IMPLIB=icui
-
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-DEFNAME=	$(SHL1TARGET)
+SHL1DEPN=
+SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
+DEF1NAME=       $(SHL1TARGET)
 
 SHL1LIBS=	\
             $(SLB)$/options.lib  \