remove unnecessary util dir

Change-Id: I66e1882d14c59abeb6aa01b662dfc3a89238d3c0

postprocess/Rdb_services.mk

@@ -113,9 +113,9 @@ $(eval $(call gb_Rdb_add_components,services,\
 		sccomp/source/solver/solver \
 	) \
 	writerfilter/util/writerfilter \
-	writerperfect/util/wpftwriter \
-	writerperfect/util/wpftdraw \
+	writerperfect/source/draw/wpftdraw \
 	writerperfect/source/impress/wpftimpress \
+	writerperfect/source/writer/wpftwriter \
 	$(if $(filter MACOSX,$(OS)), \
 		$(if $(filter-out X86_64,$(CPUNAME)), \
 			$(if $(filter TRUE,$(ENABLE_MACOSX_SANDBOX)),, \

writerperfect/Library_wpftdraw.mk

@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Library_Library,wpftdraw))
 
-$(eval $(call gb_Library_set_componentfile,wpftdraw,writerperfect/util/wpftdraw))
+$(eval $(call gb_Library_set_componentfile,wpftdraw,writerperfect/source/draw/wpftdraw))
 
 $(eval $(call gb_Library_set_include,wpftdraw,\
 	$$(INCLUDE) \

writerperfect/Library_wpftwriter.mk

@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Library_Library,wpftwriter))
 
-$(eval $(call gb_Library_set_componentfile,wpftwriter,writerperfect/util/wpftwriter))
+$(eval $(call gb_Library_set_componentfile,wpftwriter,writerperfect/source/writer/wpftwriter))
 
 $(eval $(call gb_Library_set_include,wpftwriter,\
 	$$(INCLUDE) \