From 9eeacd275178f5fed34ee9debf431a1ac3e169cc Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Tue, 2 Jul 2013 09:10:55 +0100
Subject: XmlReadOnlyImage is now unused post .ui conversions

Change-Id: Ib90966ed6e791371dacd8d9cdf8234fa66b02858
---
 xmlsecurity/AllLangResTarget_xsec.mk          |  1 -
 xmlsecurity/inc/xmlsecurity/global.hrc        |  4 +--
 xmlsecurity/inc/xmlsecurity/macrosecurity.hxx | 10 --------
 xmlsecurity/source/dialogs/macrosecurity.cxx  | 35 -------------------------
 xmlsecurity/source/dialogs/macrosecurity.src  | 37 ---------------------------
 5 files changed, 2 insertions(+), 85 deletions(-)
 delete mode 100644 xmlsecurity/source/dialogs/macrosecurity.src

(limited to 'xmlsecurity')

diff --git a/xmlsecurity/AllLangResTarget_xsec.mk b/xmlsecurity/AllLangResTarget_xsec.mk
index 5c815b73b062..9d77f33c5f07 100644
--- a/xmlsecurity/AllLangResTarget_xsec.mk
+++ b/xmlsecurity/AllLangResTarget_xsec.mk
@@ -25,7 +25,6 @@ $(eval $(call gb_SrsTarget_set_include,xmlsec/res,\
 
 $(eval $(call gb_SrsTarget_add_files,xmlsec/res,\
 	xmlsecurity/source/dialogs/certificateviewer.src \
-	xmlsecurity/source/dialogs/macrosecurity.src \
 	xmlsecurity/source/dialogs/digitalsignaturesdialog.src \
 	xmlsecurity/source/component/warnbox.src \
 ))
diff --git a/xmlsecurity/inc/xmlsecurity/global.hrc b/xmlsecurity/inc/xmlsecurity/global.hrc
index 91f854761026..7608d5cbe50c 100644
--- a/xmlsecurity/inc/xmlsecurity/global.hrc
+++ b/xmlsecurity/inc/xmlsecurity/global.hrc
@@ -27,8 +27,8 @@
 #define RID_XMLSECTP_DETAILS                1004
 #define RID_XMLSECTP_CERTPATH               1005
 #define RID_XMLSECTP_MACROWARN              1009
-#define RID_XMLSECTP_READONLY_CONFIG_TIP    1010
-#define RID_XMLSECTP_LOCK                   1011
+
+
 #define RID_XMLSECWB_NO_MOZILLA_PROFILE     1013
 
 #endif
diff --git a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
index 616e3fa39cef..1136224279db 100644
--- a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
+++ b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
@@ -39,16 +39,6 @@ namespace xml { namespace crypto {
 
 class MacroSecurityTP;
 
-class XmlReadOnlyImage : public FixedImage
-{
-public:
-    XmlReadOnlyImage(Window* pParent, const ResId rResId);
-    ~XmlReadOnlyImage();
-
-    virtual void        RequestHelp( const HelpEvent& rHEvt );
-    static const OUString& GetHelpTip();
-};
-
 class MacroSecurity : public TabDialog
 {
 private:
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index 73d483f45347..19c322811ac6 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -433,39 +433,4 @@ void MacroSecurityTrustedSourcesTP::ClosePage( void )
     mpDlg->maSecOptions.SetTrustedAuthors( maTrustedAuthors );
 }
 
-XmlReadOnlyImage::XmlReadOnlyImage(Window* pParent, const ResId rResId) :
-            FixedImage(pParent, rResId)
-{
-    SetImage( Image(XMLSEC_RES( RID_XMLSECTP_LOCK )));
-}
-
-XmlReadOnlyImage::~XmlReadOnlyImage()
-{
-}
-
-void XmlReadOnlyImage::RequestHelp( const HelpEvent& rHEvt )
-{
-    if( Help::IsBalloonHelpEnabled() || Help::IsQuickHelpEnabled() )
-    {
-        Rectangle   aLogicPix( LogicToPixel( Rectangle( Point(), GetOutputSize() ) ) );
-        Rectangle   aScreenRect( OutputToScreenPixel( aLogicPix.TopLeft() ),
-                                     OutputToScreenPixel( aLogicPix.BottomRight() ) );
-
-        OUString aStr(XmlReadOnlyImage::GetHelpTip());
-        if ( Help::IsBalloonHelpEnabled() )
-            Help::ShowBalloon( this, rHEvt.GetMousePosPixel(), aScreenRect,
-            aStr );
-        else if ( Help::IsQuickHelpEnabled() )
-            Help::ShowQuickHelp( this, aScreenRect, aStr );
-    }
-    else
-        Window::RequestHelp( rHEvt );
-}
-
-const OUString& XmlReadOnlyImage::GetHelpTip()
-{
-     static OUString aStr(XMLSEC_RES( RID_XMLSECTP_READONLY_CONFIG_TIP));
-     return aStr;
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/dialogs/macrosecurity.src b/xmlsecurity/source/dialogs/macrosecurity.src
deleted file mode 100644
index 16e2006f1c7d..000000000000
--- a/xmlsecurity/source/dialogs/macrosecurity.src
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "dialogs.hrc"
-#include "helpids.hrc"
-
-String RID_XMLSECTP_READONLY_CONFIG_TIP
-{
-    Text [ en-US ] = "This setting is protected by the Administrator";
-};
-
-Image RID_XMLSECTP_LOCK
-{
-    ImageBitmap = Bitmap
-    {
-        File = "lock.bmp";
-    };
-    MaskColor = Color { Red=0xffff; Green=0x0000; Blue=0xffff; };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-- 
cgit