Commits

Anonymous committed aca9c3b

solve some merge problems

  • Participants
  • Parent commits accbde9

Comments (0)

Files changed (6)

sc/source/ui/unoobj/docuno.cxx

 #include <svl/numuno.hxx>
 #include <svl/smplhint.hxx>
 #include <unotools/undoopt.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <sfx2/printer.hxx>
 #include <sfx2/bindings.hxx>
 #include <vcl/pdfextoutdevdata.hxx>

sd/source/ui/view/DocumentRenderer.cxx

 #include <tools/resary.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 
 #include <vector>
 

sfx2/source/view/viewprn.cxx

 #include <com/sun/star/view/PrintableState.hpp>
 #include "com/sun/star/view/XRenderable.hpp"
 
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <vcl/msgbox.hxx>
 #include <svtools/printdlg.hxx>
 #include <svtools/prnsetup.hxx>
 #include <svl/intitem.hxx>
 #include <svl/eitem.hxx>
 #include <sfx2/app.hxx>
-#include <svtools/useroptions.hxx>
-#include <svtools/printwarningoptions.hxx>
+#include <unotools/useroptions.hxx>
+#include <unotools/printwarningoptions.hxx>
 #include <tools/datetime.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/objface.hxx>

starmath/source/unomodel.cxx

 #include <xmloff/xmluconv.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <comphelper/propertysetinfo.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 
 #include <unomodel.hxx>
 #include <document.hxx>

sw/source/core/view/vprint.cxx

 #include <svx/svdview.hxx>
 #include <unotools/localedatawrapper.hxx>
 
-#include <svtools/moduleoptions.hxx>
-#include <svtools/languageoptions.hxx>
+#include <unotools/moduleoptions.hxx>
+#include <svl/languageoptions.hxx>
 
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/view/XRenderable.hpp>

vcl/source/gdi/makefile.mk

 					$(SLO)$/print.obj		\
                     $(SLO)$/print2.obj		\
                     $(SLO)$/print3.obj		\
+                    $(SLO)$/oldprintadaptor.obj		\
 					$(SLO)$/configsettings.obj 	\
                     $(SLO)$/sallayout.obj		\
                     $(SLO)$/image.obj		\
                     $(SLO)$/pngread.obj		\
                     $(SLO)$/pngwrite.obj    \
 			        $(SLO)$/virdev.obj \
-				    $(SLO)$/impprn.obj \
                     $(SLO)$/gdimtf.obj		\
 					$(SLO)$/graphictools.obj \
                     $(SLO)$/textlayout.obj   \
 			$(SLO)$/mapmod.obj		\
 			$(SLO)$/metaact.obj 	\
 			$(SLO)$/octree.obj		\
-            $(SLO)$/oldprintadaptor.obj		\
 			$(SLO)$/outmap.obj		\
 			$(SLO)$/outdev2.obj 	\
 			$(SLO)$/outdev4.obj 	\
 			$(SLO)$/pdfwriter.obj	\
 			$(SLO)$/salgdilayout.obj	\
 			$(SLO)$/extoutdevdata.obj	\
-			$(SLO)$/salnativewidgets-none.obj	\
-			$(SLO)$/bmpconv.obj		\
-			$(SLO)$/pngread.obj		\
-			$(SLO)$/pngwrite.obj	\
-			$(SLO)$/graphictools.obj
+			$(SLO)$/salnativewidgets-none.obj
 
 
 # --- Targets ------------------------------------------------------