Commits

sj  committed b91c5cb

impress186: solved merge problems

  • Participants
  • Parent commits b601699

Comments (0)

Files changed (3)

File svtools/inc/svtools/svtools.hrc

 //.............................................................................
 // various unsorted stuff
 
-#define DLG_EXPORT_PIX					(RID_SVTOOLS_START+1)
-#define DLG_EXPORT_VEC					(RID_SVTOOLS_START+2)
 #define DLG_TWAIN_SOURCE				(RID_SVTOOLS_START+3)
 
 #define DLG_SVT_EXPLORERFILE            (RID_SVTOOLS_START+4)
 #define DLG_SVT_QUERYFOLDERNAME         (RID_SVTOOLS_START+5)
 #define DLG_SVT_QUERYDELETE             (RID_SVTOOLS_START+6)
 
-#define EXPORT_DIALOG_TITLE 			(RID_SVTOOLS_START+4)
-#define KEY_MODE						(RID_SVTOOLS_START+5)
-#define KEY_RES 						(RID_SVTOOLS_START+6)
-#define KEY_SIZE						(RID_SVTOOLS_START+7)
-
-#define KEY_COLORS						(RID_SVTOOLS_START+9)
-#define KEY_RLE_CODING					(RID_SVTOOLS_START+10)
-
 #define STR_SVT_AUTOMATIC_COLOR			(RID_SVTOOLS_START+16)
 
 #define STR_SVT_FILEVIEW_COLUMN_TITLE   (RID_SVTOOLS_START + 20)
 
 //.............................................................................
 // dialogs
-
-#define DLG_EXPORT_JPG_START			(RID_SVTOOLS_START+110)
-#define DLG_EXPORT_JPG					(RID_SVTOOLS_START+111)
-#define DLG_EXPORT_JPG_END				(RID_SVTOOLS_START+112)
+#define DLG_EXPORT_START				(STR_ARR_SVT_LANGUAGE_TABLE_END + 1)
+#define DLG_EXPORT						(DLG_EXPORT_START)
+#define DLG_EXPORT_TITLE 				(DLG_EXPORT_START+1)
+#define DLG_EXPORT_END					(DLG_EXPORT_TITLE)
 
 #define DLG_LOGIN						(RID_SVTOOLS_START+113)
 #define DLG_ADDRESSBOOKSOURCE			(RID_SVTOOLS_START+114)
 
 #define DLG_REGISTRATION_REQUEST		(RID_SVTOOLS_START+115)
 
-#define DLG_EXPORT_EPNG					(RID_SVTOOLS_START+116)
 //.............................................................................
 // bitmaps
 

File svtools/source/filter.vcl/filter/exportdialog.hrc

  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include <svl/svtools.hrc>
+#include <svtools/svtools.hrc>
 
 #define BTN_OK					1
 #define BTN_CANCEL				1

File svtools/source/filter.vcl/filter/filter.cxx

 #include "xbmread.hxx"
 #include "xpmread.hxx"
 #include <svl/solar.hrc>
-#include <svl/svtools.hrc>
+#include <svtools/svtools.hrc>
 #include "sgffilt.hxx"
 #include "osl/module.hxx"
 #include <com/sun/star/uno/Reference.h>