diff options
| -rw-r--r-- | extensions/AllLangResTarget_scn.mk | 27 | ||||
| -rw-r--r-- | extensions/Module_extensions.mk | 1 | ||||
| -rw-r--r-- | extensions/source/scanner/grid.cxx | 11 | ||||
| -rw-r--r-- | scp2/source/ooo/file_resource_ooo.scp | 6 | ||||
| -rw-r--r-- | scp2/source/ooo/module_lang_template.scp | 1 |
5 files changed, 0 insertions, 46 deletions
diff --git a/extensions/AllLangResTarget_scn.mk b/extensions/AllLangResTarget_scn.mk deleted file mode 100644 index 10ee455f85d0..000000000000 --- a/extensions/AllLangResTarget_scn.mk +++ /dev/null @@ -1,27 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,scn)) - -$(eval $(call gb_AllLangResTarget_set_reslocation,scn,extensions/source/scanner)) - -$(eval $(call gb_AllLangResTarget_add_srs,scn,\ - scn/res \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,scn/res)) - -$(eval $(call gb_SrsTarget_set_include,scn/res,\ - $$(INCLUDE) \ - -I$(SRCDIR)/extensions/source/scanner \ -)) - -# vim:set noet sw=4 ts=4: diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index de1fa1bc9610..f62ba8d4034c 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -19,7 +19,6 @@ $(eval $(call gb_Module_add_targets,extensions,\ $(eval $(call gb_Module_add_l10n_targets,extensions,\ AllLangResTarget_abp \ - AllLangResTarget_scn \ AllLangResTarget_upd \ UIConfig_sabpilot \ UIConfig_scanner \ diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx index 88a09b32fa0c..4de38dedc1f7 100644 --- a/extensions/source/scanner/grid.cxx +++ b/extensions/source/scanner/grid.cxx @@ -138,17 +138,6 @@ public: virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; }; - -namespace { - -ResId SaneResId( sal_uInt32 nID ) -{ - static ResMgr* pResMgr = ResMgr::CreateResMgr( "scn" ); - return ResId( nID, *pResMgr ); -} - -} - GridWindow::GridWindow(Window* pParent) : Window(pParent, 0) , m_aGridArea(50, 15, 100, 100) diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp index a8dd5eb8b027..e54442665c94 100644 --- a/scp2/source/ooo/file_resource_ooo.scp +++ b/scp2/source/ooo/file_resource_ooo.scp @@ -59,12 +59,6 @@ STD_RES_FILE( gid_File_Res_Pcr, pcr) STD_RES_FILE( gid_File_Res_Pdffilter, pdffilter) -#ifdef UNX - -STD_RES_FILE( gid_File_Res_San, scn ) - -#endif - STD_RES_FILE( gid_File_Res_Sd, sd ) STD_RES_FILE( gid_File_Res_Sfx, sfx ) diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp index 104712bf93d2..8e3a1a7e2e24 100644 --- a/scp2/source/ooo/module_lang_template.scp +++ b/scp2/source/ooo/module_lang_template.scp @@ -81,7 +81,6 @@ Module gid_Module_Langpack_Resource_Template gid_File_Res_Ofa, gid_File_Res_Pcr, gid_File_Res_Pdffilter, - gid_File_Res_San, gid_File_Res_Sb, gid_File_Res_Sd, gid_File_Res_Sfx, |