CWS gnumake2: resolve conflicts and make sources buildable on Linux

4 files changed, 1 insertions, 30 deletions

diff --git a/svtools/AllLangResTarget_svt.mk b/svtools/AllLangResTarget_svt.mk
index c198601f3ca7..3574b2e6c9ec 100644
--- a/svtools/AllLangResTarget_svt.mk
+++ b/svtools/AllLangResTarget_svt.mk
@@ -61,10 +61,6 @@ $(eval $(call gb_SrsTarget_add_files,svt/res,\
     svtools/source/dialogs/prnsetup.src \
     svtools/source/dialogs/so3res.src \
     svtools/source/dialogs/wizardmachine.src \
-    svtools/source/filter.vcl/filter/dlgejpg.src \
-    svtools/source/filter.vcl/filter/dlgepng.src \
-    svtools/source/filter.vcl/filter/dlgexpor.src \
-    svtools/source/filter.vcl/filter/strings.src \
     svtools/source/java/javaerror.src \
     svtools/source/misc/ehdl.src \
     svtools/source/misc/helpagent.src \
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index f8415a98b922..8fb07c2d8f49 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -105,7 +105,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
     svtools/source/config/optionsdrawinglayer \
     svtools/source/config/printoptions \
     svtools/source/contnr/contentenumeration \
-    svtools/source/contnr/ctrdll \
     svtools/source/contnr/fileview \
     svtools/source/contnr/imivctl1 \
     svtools/source/contnr/imivctl2 \
@@ -124,7 +123,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
     svtools/source/control/calendar \
     svtools/source/control/collatorres \
     svtools/source/control/ctrlbox \
-    svtools/source/control/ctrldll \
     svtools/source/control/ctrltool \
     svtools/source/control/filectrl \
     svtools/source/control/filectrl2 \
@@ -178,15 +176,12 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
     svtools/source/edit/textwindowpeer \
     svtools/source/edit/txtattr \
     svtools/source/edit/xtextedt \
+    svtools/source/filter.vcl/filter/exportdialog \
     svtools/source/filter.vcl/filter/FilterConfigCache \
     svtools/source/filter.vcl/filter/FilterConfigItem \
     svtools/source/filter.vcl/filter/SvFilterOptionsDialog \
-    svtools/source/filter.vcl/filter/dlgejpg \
-    svtools/source/filter.vcl/filter/dlgepng \
-    svtools/source/filter.vcl/filter/dlgexpor \
     svtools/source/filter.vcl/filter/filter \
     svtools/source/filter.vcl/filter/filter2 \
-    svtools/source/filter.vcl/filter/fldll \
     svtools/source/filter.vcl/filter/sgfbram \
     svtools/source/filter.vcl/filter/sgvmain \
     svtools/source/filter.vcl/filter/sgvspln \
diff --git a/svtools/inc/svtools/svtdata.hxx b/svtools/inc/svtools/svtdata.hxx
index 91a50a15c666..ad7b60b3f2b7 100644
--- a/svtools/inc/svtools/svtdata.hxx
+++ b/svtools/inc/svtools/svtdata.hxx
@@ -57,23 +57,7 @@ public:
 };
 
 //============================================================================
-<<<<<<< local
-
-class SvpResId: public ResId
-{
-public:
-    SvpResId( USHORT nId, const ::com::sun::star::lang::Locale aLocale ):
-        ResId( nId, *ImpSvtData::GetSvtData().GetResMgr( aLocale ) ) {}
-
-     // VCL dependant, only available in SVT, not in SVL!
-    SvpResId( USHORT nId );
-};
-
-
 class SVT_DLLPUBLIC SvtResId: public ResId
-=======
-class SvtResId: public ResId
->>>>>>> other
 {
 public:
     SvtResId(USHORT nId, const ::com::sun::star::lang::Locale aLocale);
diff --git a/svtools/source/dialogs/printdlg.cxx b/svtools/source/dialogs/printdlg.cxx
index 779ff1da903b..ab8b69fdcda1 100644
--- a/svtools/source/dialogs/printdlg.cxx
+++ b/svtools/source/dialogs/printdlg.cxx
@@ -38,12 +38,8 @@
 #include <svtools/prnsetup.hxx>
 #include <svtools/printdlg.hxx>
 #include <svtools/svtdata.hxx>
-<<<<<<< local
 #include <svtools/filedlg.hxx>
 #include "svl/pickerhelper.hxx"
-=======
-#include <filedlg.hxx>
->>>>>>> other
 #include <svtools/helpid.hrc>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>