diff options
-rw-r--r-- | filter/inc/bitmaps.hlst | 18 | ||||
-rw-r--r-- | filter/source/pdf/impdialog.cxx | 5 | ||||
-rw-r--r-- | filter/source/pdf/impdialog.hrc | 2 | ||||
-rw-r--r-- | filter/source/pdf/impdialog.src | 10 | ||||
-rw-r--r-- | postprocess/CustomTarget_images.mk | 1 |
5 files changed, 22 insertions, 14 deletions
diff --git a/filter/inc/bitmaps.hlst b/filter/inc/bitmaps.hlst new file mode 100644 index 000000000000..82e82f76632a --- /dev/null +++ b/filter/inc/bitmaps.hlst @@ -0,0 +1,18 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * 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/. + */ + +#ifndef INCLUDED_FILTER_INC_BITMAPS_HRC +#define INCLUDED_FILTER_INC_BITMAPS_HRC + +#define IMG_WARN "res/ballgreen_7.png" +#define IMG_ERR "res/ballred_7.png" + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index 8d27a63df4d1..e509e43e867a 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -21,6 +21,7 @@ #include "impdialog.hxx" #include "impdialog.hrc" +#include "bitmaps.hlst" #include <officecfg/Office/Common.hxx> #include <vcl/layout.hxx> #include <vcl/settings.hxx> @@ -1602,8 +1603,8 @@ ImplErrorDialog::ImplErrorDialog(const std::set< vcl::PDFWriter::ErrorCode >& rE m_pExplanation->set_height_request(aSize.Height()); // load images - Image aWarnImg( BitmapEx( PDFFilterResId( IMG_WARN ) ) ); - Image aErrImg( BitmapEx( PDFFilterResId( IMG_ERR ) ) ); + Image aWarnImg(BitmapEx(IMG_WARN)); + Image aErrImg(BitmapEx(IMG_ERR)); for( std::set<vcl::PDFWriter::ErrorCode>::const_iterator it = rErrors.begin(); it != rErrors.end(); ++it ) diff --git a/filter/source/pdf/impdialog.hrc b/filter/source/pdf/impdialog.hrc index 57f1045c8974..cd9f7772cb8b 100644 --- a/filter/source/pdf/impdialog.hrc +++ b/filter/source/pdf/impdialog.hrc @@ -38,8 +38,6 @@ #define STR_WARN_FORMACTION_PDFA_SHORT (RID_PDF_DIALOG_START + 14) #define STR_WARN_TRANSP_CONVERTED (RID_PDF_DIALOG_START + 15) #define STR_WARN_TRANSP_CONVERTED_SHORT (RID_PDF_DIALOG_START + 16) -#define IMG_WARN (RID_PDF_DIALOG_START + 17) -#define IMG_ERR (RID_PDF_DIALOG_START + 18) //ATTENTION: maximum allowed value is (RID_PDF_DIALOG_START + 19) //(see filter/inc/filter.hrc) diff --git a/filter/source/pdf/impdialog.src b/filter/source/pdf/impdialog.src index 53ba8f22963e..cb5b68a61ae8 100644 --- a/filter/source/pdf/impdialog.src +++ b/filter/source/pdf/impdialog.src @@ -88,14 +88,4 @@ String STR_ERR_PDF_EXPORT_ABORTED Text [en-US] = "PDF export aborted"; }; -Bitmap IMG_WARN -{ - File = "ballgreen_7.png"; -}; - -Bitmap IMG_ERR -{ - File = "ballred_7.png"; -}; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk index 01c229fb2c1f..8e9aece9297e 100644 --- a/postprocess/CustomTarget_images.mk +++ b/postprocess/CustomTarget_images.mk @@ -56,6 +56,7 @@ $(packimages_DIR)/sourceimagelist.ilst : \ $(SRCDIR)/dbaccess/inc/bitmaps.hlst \ $(SRCDIR)/desktop/inc/bitmaps.hlst \ $(SRCDIR)/extensions/inc/bitmaps.hlst \ + $(SRCDIR)/filter/inc/bitmaps.hlst \ $(SRCDIR)/sfx2/inc/bitmaps.hlst \ $(SRCDIR)/vcl/inc/bitmaps.hlst grep res $^ | cut -d'"' -f2 | sed "s/^/%MODULE%\//" | sed "s/%MODULE%.res/%GLOBALRES%/g" > $@ |