[Libreoffice-commits] core.git: vcl/inc vcl/source xmlsecurity/source

[Caolán McNamara]

 vcl/inc/printdlg.hxx                             |    4 ++--
 vcl/inc/svids.hrc                                |    4 ++--
 vcl/source/src/print.src                         |    8 ++++----
 vcl/source/window/printdlg.cxx                   |    8 ++++----
 xmlsecurity/source/dialogs/certificateviewer.cxx |    3 +--
 xmlsecurity/source/dialogs/certificateviewer.src |    4 ++--
 xmlsecurity/source/dialogs/dialogs.hrc           |    2 +-
 7 files changed, 16 insertions(+), 17 deletions(-)

New commits:
commit a98c28cc305a29410b3255c3f07aa117a1ca24fe
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Jan 14 20:51:36 2017 +0000

    u*,v*: load BitmapEx resources instead of Image ones
    
    Change-Id: If279c55a0055e51e04b31e0db745779c3a44bcd6

diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index fc30c21..530275b 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -147,8 +147,8 @@ namespace vcl
             VclPtr<FixedImage>                      mpCollateImage;
             VclPtr<CheckBox>                        mpReverseOrderBox;
 
-            Image                                   maCollateImg;
-            Image                                   maNoCollateImg;
+            BitmapEx                                maCollateBmp;
+            BitmapEx                                maNoCollateBmp;
 
             long                                    mnCollateUIMode;
 
diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index 01bce62..47fb067 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -187,8 +187,8 @@
 #define SV_PRINT_TOFILE_TXT                         10610
 #define SV_PRINT_DEFPRT_TXT                         10611
 #define SV_PRINT_PRINTPREVIEW_TXT                   10612
-#define SV_PRINT_COLLATE_IMG                        10613
-#define SV_PRINT_NOCOLLATE_IMG                      10614
+#define SV_PRINT_COLLATE_BMP                        10613
+#define SV_PRINT_NOCOLLATE_BMP                      10614
 #define SV_PRINT_QUERYFAXNUMBER_TXT                 10615
 #define SV_PRINT_INVALID_TXT                        10616
 #define SV_PRINT_CUSTOM_TXT                         10617
diff --git a/vcl/source/src/print.src b/vcl/source/src/print.src
index cbfe6ed..13db4a3 100644
--- a/vcl/source/src/print.src
+++ b/vcl/source/src/print.src
@@ -95,14 +95,14 @@ String SV_PRINT_PRINTPREVIEW_TXT
     Text [en-US] = "Print preview";
 };
 
-Image SV_PRINT_COLLATE_IMG
+Bitmap SV_PRINT_COLLATE_BMP
 {
-    ImageBitmap = Bitmap { File = "collate.png" ; };
+    File = "collate.png" ;
 };
 
-Image SV_PRINT_NOCOLLATE_IMG
+Bitmap SV_PRINT_NOCOLLATE_BMP
 {
-    ImageBitmap = Bitmap { File = "ncollate.png" ; };
+    File = "ncollate.png" ;
 };
 
 String SV_PRINT_QUERYFAXNUMBER_TXT
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index d0df38d..0600e9f 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -475,9 +475,9 @@ void PrintDialog::NUpTabPage::initFromMultiPageSetup( const vcl::PrinterControll
 }
 
 PrintDialog::JobTabPage::JobTabPage( VclBuilder* pUIBuilder )
-    : maCollateImg( VclResId( SV_PRINT_COLLATE_IMG ) )
-    , maNoCollateImg( VclResId( SV_PRINT_NOCOLLATE_IMG ) )
-    , mnCollateUIMode( 0 )
+    : maCollateBmp(VclResId(SV_PRINT_COLLATE_BMP))
+    , maNoCollateBmp(VclResId(SV_PRINT_NOCOLLATE_BMP))
+    , mnCollateUIMode(0)
 {
     pUIBuilder->get(mpPrinters, "printers");
     pUIBuilder->get(mpStatusTxt, "status");
@@ -1210,7 +1210,7 @@ void PrintDialog::checkControlDependencies()
     else
         maJobPage.mpCollateBox->Enable( false );
 
-    Image aImg( maJobPage.mpCollateBox->IsChecked() ? maJobPage.maCollateImg : maJobPage.maNoCollateImg );
+    Image aImg(maJobPage.mpCollateBox->IsChecked() ? maJobPage.maCollateBmp : maJobPage.maNoCollateBmp);
 
     Size aImgSize( aImg.GetSizePixel() );
 
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx
index c1d5574..0d15353 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -113,8 +113,7 @@ CertificateViewerGeneralTP::CertificateViewerGeneralTP( vcl::Window* _pParent, C
 
     if ( !bCertValid )
     {
-        m_pCertImg->SetImage(
-            Image( XMLSEC_RES( IMG_STATE_NOT_VALIDATED ) ) );
+        m_pCertImg->SetImage(Image(BitmapEx(XMLSEC_RES(BMP_STATE_NOT_VALIDATED))));
         m_pHintNotTrustedFI->SetText( XMLSEC_RES( STR_CERTIFICATE_NOT_VALIDATED ) );
     }
 
diff --git a/xmlsecurity/source/dialogs/certificateviewer.src b/xmlsecurity/source/dialogs/certificateviewer.src
index b967efb..bd48618 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.src
+++ b/xmlsecurity/source/dialogs/certificateviewer.src
@@ -24,9 +24,9 @@ String STR_CERTIFICATE_NOT_VALIDATED
     Text [ en-US ] = "The certificate could not be validated.";
 };
 
-Image IMG_STATE_NOT_VALIDATED
+Bitmap BMP_STATE_NOT_VALIDATED
 {
-    ImageBitmap = Bitmap { File = "notcertificate_40x56.png"; };
+    File = "notcertificate_40x56.png";
 };
 
 String STR_HEADERBAR
diff --git a/xmlsecurity/source/dialogs/dialogs.hrc b/xmlsecurity/source/dialogs/dialogs.hrc
index d4bd3ab..b6299a9 100644
--- a/xmlsecurity/source/dialogs/dialogs.hrc
+++ b/xmlsecurity/source/dialogs/dialogs.hrc
@@ -50,7 +50,7 @@
 
 // --------- tab page Certificate viewer - General ---------
 #define STR_CERTIFICATE_NOT_VALIDATED   269
-#define IMG_STATE_NOT_VALIDATED         270
+#define BMP_STATE_NOT_VALIDATED         270
 
 // --------- tab page Certificate viewer - Certification Path ---------