From 040e022d06ecadc36d3ef5c52178095a4d2c828a Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sat, 10 Nov 2012 23:22:47 +0000 Subject: move svtools's FixedHyper.hxx to vcl merge with fixedhyperbase and map GtkLinkButton to FixedHyper. Convert to String while I'm at it. Change-Id: Ibc61fd29c01796561eeef952a159c82ff215a095 --- toolkit/Library_tk.mk | 1 - toolkit/Package_inc.mk | 1 - toolkit/inc/toolkit/helper/fixedhyperbase.hxx | 50 --------------------- toolkit/source/awt/vclxwindows.cxx | 14 +++--- toolkit/source/helper/fixedhyperbase.cxx | 63 --------------------------- 5 files changed, 7 insertions(+), 122 deletions(-) delete mode 100644 toolkit/inc/toolkit/helper/fixedhyperbase.hxx delete mode 100644 toolkit/source/helper/fixedhyperbase.cxx (limited to 'toolkit') diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index b7994783559d..cfd0079c2978 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -114,7 +114,6 @@ $(eval $(call gb_Library_add_exception_objects,tk,\ toolkit/source/controls/unocontrols \ toolkit/source/helper/accessibilityclient \ toolkit/source/helper/externallock \ - toolkit/source/helper/fixedhyperbase \ toolkit/source/helper/formpdfexport \ toolkit/source/helper/imagealign \ toolkit/source/helper/listenermultiplexer \ diff --git a/toolkit/Package_inc.mk b/toolkit/Package_inc.mk index 2bd4246d9d58..b2e0b326bbea 100644 --- a/toolkit/Package_inc.mk +++ b/toolkit/Package_inc.mk @@ -38,7 +38,6 @@ $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/accessiblefacto $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/convert.hxx,toolkit/helper/convert.hxx)) $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/emptyfontdescriptor.hxx,toolkit/helper/emptyfontdescriptor.hxx)) $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/externallock.hxx,toolkit/helper/externallock.hxx)) -$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/fixedhyperbase.hxx,toolkit/helper/fixedhyperbase.hxx)) $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/formpdfexport.hxx,toolkit/helper/formpdfexport.hxx)) $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/imagealign.hxx,toolkit/helper/imagealign.hxx)) $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/listenermultiplexer.hxx,toolkit/helper/listenermultiplexer.hxx)) diff --git a/toolkit/inc/toolkit/helper/fixedhyperbase.hxx b/toolkit/inc/toolkit/helper/fixedhyperbase.hxx deleted file mode 100644 index 950d9e4ab214..000000000000 --- a/toolkit/inc/toolkit/helper/fixedhyperbase.hxx +++ /dev/null @@ -1,50 +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 . - */ - -#ifndef TOOLKIT_INC_TOOLKIT_HELPER_FIXEDHYPERBASE_HXX -#define TOOLKIT_INC_TOOLKIT_HELPER_FIXEDHYPERBASE_HXX - -#include - -#include - -//........................................................................ -namespace toolkit -{ -//........................................................................ - - class TOOLKIT_DLLPUBLIC FixedHyperlinkBase : public FixedText - { - public: - FixedHyperlinkBase( Window* pParent, const ResId& rId ); - FixedHyperlinkBase( Window* pParent, WinBits nWinStyle ); - virtual ~FixedHyperlinkBase(); - - virtual void SetURL( const String& rNewURL ); - virtual String GetURL() const; - virtual void SetDescription( const String& rNewDescription ); - }; - -//........................................................................ -} // namespace toolkit -//........................................................................ - -#endif // TOOLKIT_INC_TOOLKIT_HELPER_FIXEDHYPERBASE_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index 434ae8b61736..41774812a48e 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include @@ -46,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -2919,7 +2919,7 @@ void VCLXFixedHyperlink::ProcessWindowEvent( const VclWindowEvent& rVclWindowEve { // open the URL ::rtl::OUString sURL; - ::toolkit::FixedHyperlinkBase* pBase = (::toolkit::FixedHyperlinkBase*)GetWindow(); + FixedHyperlink* pBase = (FixedHyperlink*)GetWindow(); if ( pBase ) sURL = pBase->GetURL(); Reference< ::com::sun::star::system::XSystemShellExecute > xSystemShellExecute( ::com::sun::star::system::SystemShellExecute::create( @@ -2954,7 +2954,7 @@ void VCLXFixedHyperlink::setText( const ::rtl::OUString& Text ) throw(::com::sun { SolarMutexGuard aGuard; - ::toolkit::FixedHyperlinkBase* pBase = (::toolkit::FixedHyperlinkBase*)GetWindow(); + FixedHyperlink* pBase = (FixedHyperlink*)GetWindow(); if ( pBase ) pBase->SetDescription( Text ); } @@ -2974,7 +2974,7 @@ void VCLXFixedHyperlink::setURL( const ::rtl::OUString& URL ) throw(::com::sun:: { SolarMutexGuard aGuard; - ::toolkit::FixedHyperlinkBase* pBase = (::toolkit::FixedHyperlinkBase*)GetWindow(); + FixedHyperlink* pBase = (FixedHyperlink*)GetWindow(); if ( pBase ) pBase->SetURL( URL ); } @@ -2984,7 +2984,7 @@ void VCLXFixedHyperlink::setURL( const ::rtl::OUString& URL ) throw(::com::sun:: SolarMutexGuard aGuard; ::rtl::OUString aText; - ::toolkit::FixedHyperlinkBase* pBase = (::toolkit::FixedHyperlinkBase*)GetWindow(); + FixedHyperlink* pBase = (FixedHyperlink*)GetWindow(); if ( pBase ) aText = pBase->GetURL(); return aText; @@ -3074,7 +3074,7 @@ void VCLXFixedHyperlink::setProperty( const ::rtl::OUString& PropertyName, const { SolarMutexGuard aGuard; - ::toolkit::FixedHyperlinkBase* pBase = (::toolkit::FixedHyperlinkBase*)GetWindow(); + FixedHyperlink* pBase = (FixedHyperlink*)GetWindow(); if ( pBase ) { sal_uInt16 nPropType = GetPropertyId( PropertyName ); @@ -3109,7 +3109,7 @@ void VCLXFixedHyperlink::setProperty( const ::rtl::OUString& PropertyName, const SolarMutexGuard aGuard; ::com::sun::star::uno::Any aProp; - ::toolkit::FixedHyperlinkBase* pBase = (::toolkit::FixedHyperlinkBase*)GetWindow(); + FixedHyperlink* pBase = (FixedHyperlink*)GetWindow(); if ( pBase ) { sal_uInt16 nPropType = GetPropertyId( PropertyName ); diff --git a/toolkit/source/helper/fixedhyperbase.cxx b/toolkit/source/helper/fixedhyperbase.cxx deleted file mode 100644 index 91a03a3249a8..000000000000 --- a/toolkit/source/helper/fixedhyperbase.cxx +++ /dev/null @@ -1,63 +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 - -//........................................................................ -namespace toolkit -{ -//........................................................................ - -// ---------------------------------------------------- -// class FixedHyperlinkBase -// ---------------------------------------------------- - -FixedHyperlinkBase::FixedHyperlinkBase( Window* pParent, const ResId& rId ) : - FixedText( pParent, rId ) -{ -} - -FixedHyperlinkBase::FixedHyperlinkBase( Window* pParent, WinBits nWinStyle ) : - FixedText( pParent, nWinStyle ) -{ -} - -FixedHyperlinkBase::~FixedHyperlinkBase() -{ -} - -void FixedHyperlinkBase::SetURL( const String& ) -{ -} - -String FixedHyperlinkBase::GetURL() const -{ - return String::EmptyString(); -} - -void FixedHyperlinkBase::SetDescription( const String& ) -{ -} - -//........................................................................ -} // namespace toolkit -//........................................................................ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit v1.2.3