diff options
-rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 1 | ||||
-rw-r--r-- | xmlsecurity/inc/xmlsecurity/macrosecurity.hxx | 6 | ||||
-rw-r--r-- | xmlsecurity/source/dialogs/macrosecurity.cxx | 10 |
3 files changed, 9 insertions, 8 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 4c7c2290aa41..d5e8f17482a6 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -33,6 +33,7 @@ gb_MERGEDLIBS := \ canvastools \ configmgr \ cppcanvas \ + cui \ $(call gb_Helper_optional,DBCONNECTIVITY,dba) \ $(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \ $(call gb_Helper_optional,DBCONNECTIVITY,dbu) \ diff --git a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx index 8dc691ec84c5..9f79955bfc23 100644 --- a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx +++ b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx @@ -42,11 +42,11 @@ namespace dcss = ::com::sun::star; class MacroSecurityTP; -class ReadOnlyImage : public FixedImage +class XmlReadOnlyImage : public FixedImage { public: - ReadOnlyImage(Window* pParent, const ResId rResId); - ~ReadOnlyImage(); + XmlReadOnlyImage(Window* pParent, const ResId rResId); + ~XmlReadOnlyImage(); virtual void RequestHelp( const HelpEvent& rHEvt ); static const OUString& GetHelpTip(); diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx index 3a0a745fe203..0063b0fdc739 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.cxx +++ b/xmlsecurity/source/dialogs/macrosecurity.cxx @@ -433,17 +433,17 @@ void MacroSecurityTrustedSourcesTP::ClosePage( void ) mpDlg->maSecOptions.SetTrustedAuthors( maTrustedAuthors ); } -ReadOnlyImage::ReadOnlyImage(Window* pParent, const ResId rResId) : +XmlReadOnlyImage::XmlReadOnlyImage(Window* pParent, const ResId rResId) : FixedImage(pParent, rResId) { SetImage( Image(XMLSEC_RES( RID_XMLSECTP_LOCK ))); } -ReadOnlyImage::~ReadOnlyImage() +XmlReadOnlyImage::~XmlReadOnlyImage() { } -void ReadOnlyImage::RequestHelp( const HelpEvent& rHEvt ) +void XmlReadOnlyImage::RequestHelp( const HelpEvent& rHEvt ) { if( Help::IsBalloonHelpEnabled() || Help::IsQuickHelpEnabled() ) { @@ -451,7 +451,7 @@ void ReadOnlyImage::RequestHelp( const HelpEvent& rHEvt ) Rectangle aScreenRect( OutputToScreenPixel( aLogicPix.TopLeft() ), OutputToScreenPixel( aLogicPix.BottomRight() ) ); - OUString aStr(ReadOnlyImage::GetHelpTip()); + OUString aStr(XmlReadOnlyImage::GetHelpTip()); if ( Help::IsBalloonHelpEnabled() ) Help::ShowBalloon( this, rHEvt.GetMousePosPixel(), aScreenRect, aStr ); @@ -462,7 +462,7 @@ void ReadOnlyImage::RequestHelp( const HelpEvent& rHEvt ) Window::RequestHelp( rHEvt ); } -const OUString& ReadOnlyImage::GetHelpTip() +const OUString& XmlReadOnlyImage::GetHelpTip() { static OUString aStr(XMLSEC_RES( RID_XMLSECTP_READONLY_CONFIG_TIP)); return aStr; |