diff options
author | Jan Holesovsky <kendy@suse.cz> | 2013-01-02 22:07:41 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2013-01-04 22:02:51 +0100 |
commit | 0c22f3eadd3ffb461eada94f4b019fbb2161f197 (patch) | |
tree | 81091634b534d4b017a6a1a153df942046da7447 /svtools | |
parent | 255c03d6ad4ed13c456ee621e0af765684a475d2 (diff) |
Make LO buildable again after the GraphicFilter move.
Change-Id: I3455a7294b136400f32163626d5a7a7f2bfa898c
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/Library_svt.mk | 24 | ||||
-rw-r--r-- | svtools/Module_svtools.mk | 6 | ||||
-rw-r--r-- | svtools/Package_inc.mk | 3 | ||||
-rw-r--r-- | svtools/bmpmaker/g2g.cxx | 2 | ||||
-rw-r--r-- | svtools/inc/svtools/fltcall.hxx | 2 | ||||
-rw-r--r-- | svtools/source/filter/SvFilterOptionsDialog.cxx | 13 | ||||
-rw-r--r-- | svtools/source/filter/exportdialog.cxx | 4 | ||||
-rw-r--r-- | svtools/source/graphic/descriptor.cxx | 2 | ||||
-rw-r--r-- | svtools/source/graphic/provider.cxx | 4 | ||||
-rw-r--r-- | svtools/source/misc/embedhlp.cxx | 2 | ||||
-rw-r--r-- | svtools/source/misc/transfer.cxx | 2 |
11 files changed, 15 insertions, 49 deletions
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index fa014054b806..014807f2fcff 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -61,7 +61,6 @@ $(eval $(call gb_Library_use_libraries,svt,\ $(eval $(call gb_Library_use_externals,svt,\ icuuc \ icu_headers \ - jpeg \ )) $(eval $(call gb_Library_add_exception_objects,svt,\ @@ -144,27 +143,8 @@ $(eval $(call gb_Library_add_exception_objects,svt,\ svtools/source/edit/svmedit2 \ svtools/source/edit/syntaxhighlight \ svtools/source/edit/textwindowpeer \ - svtools/source/filter/FilterConfigCache \ - svtools/source/filter/FilterConfigItem \ svtools/source/filter/SvFilterOptionsDialog \ svtools/source/filter/exportdialog \ - svtools/source/filter/filter \ - svtools/source/filter/filter2 \ - svtools/source/filter/sgfbram \ - svtools/source/filter/sgvmain \ - svtools/source/filter/sgvspln \ - svtools/source/filter/sgvtext \ - svtools/source/filter/igif/decode \ - svtools/source/filter/igif/gifread \ - svtools/source/filter/ixbm/xbmread \ - svtools/source/filter/ixpm/xpmread \ - svtools/source/filter/jpeg/jpeg \ - svtools/source/filter/wmf/emfwr \ - svtools/source/filter/wmf/enhwmf \ - svtools/source/filter/wmf/winmtf \ - svtools/source/filter/wmf/winwmf \ - svtools/source/filter/wmf/wmf \ - svtools/source/filter/wmf/wmfwr \ svtools/source/graphic/descriptor \ svtools/source/graphic/graphic \ svtools/source/graphic/graphicunofactory \ @@ -257,10 +237,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\ svtools/source/urlobj/inetimg \ )) -$(eval $(call gb_Library_add_cobjects,svt,\ - svtools/source/filter/jpeg/jpegc \ -)) - ifeq ($(OS),WNT) $(eval $(call gb_Library_use_system_win32_libs,svt,\ advapi32 \ diff --git a/svtools/Module_svtools.mk b/svtools/Module_svtools.mk index 70871fb2ae14..604668f7ccc5 100644 --- a/svtools/Module_svtools.mk +++ b/svtools/Module_svtools.mk @@ -42,12 +42,6 @@ endif endif -ifneq ($(DISABLE_CVE_TESTS),TRUE) -$(eval $(call gb_Module_add_check_targets,svtools,\ - CppunitTest_svtools_filters_test \ -)) -endif - ifneq ($(OOO_JUNIT_JAR),) $(eval $(call gb_Module_add_subsequentcheck_targets,svtools,\ JunitTest_svtools_unoapi \ diff --git a/svtools/Package_inc.mk b/svtools/Package_inc.mk index 85afa18faf61..9be94a3f844b 100644 --- a/svtools/Package_inc.mk +++ b/svtools/Package_inc.mk @@ -20,7 +20,6 @@ $(eval $(call gb_Package_Package,svtools_inc,$(SRCDIR)/svtools/inc)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/AccessibleBrowseBoxObjType.hxx,svtools/AccessibleBrowseBoxObjType.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/DocumentInfoPreview.hxx,svtools/DocumentInfoPreview.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/FilterConfigItem.hxx,svtools/FilterConfigItem.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/QueryFolderName.hxx,svtools/QueryFolderName.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/acceleratorexecute.hxx,svtools/acceleratorexecute.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibilityoptions.hxx,svtools/accessibilityoptions.hxx)) @@ -58,7 +57,6 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filedlg.hxx,svtools/fi $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filedlg2.hrc,svtools/filedlg2.hrc)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fileurlbox.hxx,svtools/fileurlbox.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fileview.hxx,svtools/fileview.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filter.hxx,svtools/filter.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filechangedchecker.hxx,svtools/filechangedchecker.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fltcall.hxx,svtools/fltcall.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fmtfield.hxx,svtools/fmtfield.hxx)) @@ -174,7 +172,6 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/viewdataentry.hxx,svto $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wallitem.hxx,svtools/wallitem.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wizardmachine.hxx,svtools/wizardmachine.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wizdlg.hxx,svtools/wizdlg.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wmf.hxx,svtools/wmf.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/xwindowitem.hxx,svtools/xwindowitem.hxx)) # vim: set noet sw=4 ts=4: diff --git a/svtools/bmpmaker/g2g.cxx b/svtools/bmpmaker/g2g.cxx index c0a8e01f2ebd..9a3508c96198 100644 --- a/svtools/bmpmaker/g2g.cxx +++ b/svtools/bmpmaker/g2g.cxx @@ -26,7 +26,7 @@ #include <tools/fsys.hxx> #include <tools/stream.hxx> #include <vcl/svapp.hxx> -#include "svtools/filter.hxx" +#include <vcl/graphicfilter.hxx> #define EXIT_NOERROR 0x00000000 #define EXIT_COMMONERROR 0x00000001 diff --git a/svtools/inc/svtools/fltcall.hxx b/svtools/inc/svtools/fltcall.hxx index 361b060624e3..ded1d84e021a 100644 --- a/svtools/inc/svtools/fltcall.hxx +++ b/svtools/inc/svtools/fltcall.hxx @@ -23,7 +23,7 @@ #include <vcl/field.hxx> #include <com/sun/star/uno/Sequence.h> #include <com/sun/star/beans/PropertyValue.hpp> -#include <svtools/FilterConfigItem.hxx> +#include <vcl/FilterConfigItem.hxx> class FilterConfigItem; class SvStream; diff --git a/svtools/source/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter/SvFilterOptionsDialog.cxx index 320354bcf74a..7cce49bfdd6e 100644 --- a/svtools/source/filter/SvFilterOptionsDialog.cxx +++ b/svtools/source/filter/SvFilterOptionsDialog.cxx @@ -19,9 +19,8 @@ #include "SvFilterOptionsDialog.hxx" -#include <svtools/FilterConfigItem.hxx> -#include <svtools/filter.hxx> -#include "FilterConfigCache.hxx" +#include <vcl/FilterConfigItem.hxx> +#include <vcl/graphicfilter.hxx> #include <osl/file.hxx> #include <osl/module.hxx> #include <svl/solar.hrc> @@ -197,10 +196,10 @@ sal_Int16 SvFilterOptionsDialog::execute() { GraphicFilter aGraphicFilter( sal_True ); - sal_uInt16 nFormat, nFilterCount = aGraphicFilter.pConfig->GetExportFormatCount(); + sal_uInt16 nFormat, nFilterCount = aGraphicFilter.GetExportFormatCount(); for ( nFormat = 0; nFormat < nFilterCount; nFormat++ ) { - if ( aGraphicFilter.pConfig->GetExportInternalFilterName( nFormat ) == aInternalFilterName ) + if ( aGraphicFilter.GetExportInternalFilterName( nFormat ) == aInternalFilterName ) break; } if ( nFormat < nFilterCount ) @@ -213,8 +212,8 @@ sal_Int16 SvFilterOptionsDialog::execute() pResMgr = ResMgr::CreateResMgr( "svt", Application::GetSettings().GetUILanguageTag().getLocale() ); aFltCallDlgPara.pResMgr = pResMgr; - aFltCallDlgPara.aFilterExt = aGraphicFilter.pConfig->GetExportFormatShortName( nFormat ); - sal_Bool bIsPixelFormat( aGraphicFilter.pConfig->IsExportPixelFormat( nFormat ) ); + aFltCallDlgPara.aFilterExt = aGraphicFilter.GetExportFormatShortName( nFormat ); + sal_Bool bIsPixelFormat( aGraphicFilter.IsExportPixelFormat( nFormat ) ); if ( ExportDialog( aFltCallDlgPara, mxMgr, mxSourceDocument, mbExportSelection, bIsPixelFormat ).Execute() == RET_OK ) nRet = ui::dialogs::ExecutableDialogResults::OK; diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx index e3ff04e832a3..fdf73d65eb9a 100644 --- a/svtools/source/filter/exportdialog.cxx +++ b/svtools/source/filter/exportdialog.cxx @@ -23,8 +23,8 @@ #endif #include <tools/stream.hxx> -#include <svtools/filter.hxx> -#include <svtools/FilterConfigItem.hxx> +#include <vcl/graphicfilter.hxx> +#include <vcl/FilterConfigItem.hxx> #include <svtools/svtools.hrc> #include <svtools/svtresid.hxx> #include <com/sun/star/io/XStream.hpp> diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx index 0e9c9c330774..dac63180f188 100644 --- a/svtools/source/graphic/descriptor.cxx +++ b/svtools/source/graphic/descriptor.cxx @@ -21,7 +21,7 @@ #include <osl/mutex.hxx> #include <unotools/ucbstreamhelper.hxx> -#include <svtools/filter.hxx> +#include <vcl/graphicfilter.hxx> #include <svl/itemprop.hxx> #include <comphelper/servicehelper.hxx> diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx index f49ebb620073..140708757c39 100644 --- a/svtools/source/graphic/provider.cxx +++ b/svtools/source/graphic/provider.cxx @@ -27,8 +27,8 @@ #include <tools/resid.hxx> #include <tools/resmgr.hxx> #include <unotools/ucbstreamhelper.hxx> -#include <svtools/filter.hxx> -#include <svtools/wmf.hxx> +#include <vcl/graphicfilter.hxx> +#include <vcl/wmf.hxx> #include <svl/solar.hrc> #include <vcl/virdev.hxx> #include <com/sun/star/io/XStream.hpp> diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx index 4996c6dc4ca1..5d6ac82e78e0 100644 --- a/svtools/source/misc/embedhlp.cxx +++ b/svtools/source/misc/embedhlp.cxx @@ -19,7 +19,7 @@ #include <svtools/embedhlp.hxx> -#include <svtools/filter.hxx> +#include <vcl/graphicfilter.hxx> #include <svtools/svtools.hrc> #include <svtools/svtresid.hxx> diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index 735b52eefb40..e43a3ee27a6a 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -50,7 +50,7 @@ #include "svl/urlbmk.hxx" #include "inetimg.hxx" -#include <svtools/wmf.hxx> +#include <vcl/wmf.hxx> #include <svtools/imap.hxx> #include <svtools/transfer.hxx> #include <rtl/strbuf.hxx> |