[Libreoffice-commits] core.git: include/toolkit toolkit/source
Stephan Bergmann
sbergman at redhat.com
Thu Feb 27 01:27:03 PST 2014
include/toolkit/awt/vclxtabpagemodel.hxx | 73 ----------------
toolkit/source/awt/vclxtabpagemodel.cxx | 141 -------------------------------
toolkit/source/awt/vclxtoolkit.cxx | 1
3 files changed, 215 deletions(-)
New commits:
commit a463234e8893b349f99bef899e71709f3ab82cd6
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Feb 27 10:24:53 2014 +0100
Remove unused VCLXTabPageModel
Unused since 265043a935781633f204b1ddfede5f454b8555fe "tabcontrol: #i113362#
impl tabcontrol in awt" and not even built since
0a966b904bd6fd570d2fb09825810aceed4e00e8 "tabcontrol: fix some compile errors."
Change-Id: Ida6fde85207288a0b4e09cee767bd004f9384d99
diff --git a/include/toolkit/awt/vclxtabpagemodel.hxx b/include/toolkit/awt/vclxtabpagemodel.hxx
deleted file mode 100644
index d128e99..0000000
--- a/include/toolkit/awt/vclxtabpagemodel.hxx
+++ /dev/null
@@ -1,73 +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 INCLUDED_TOOLKIT_AWT_VCLXTABPAGEMODEL_HXX
-#define INCLUDED_TOOLKIT_AWT_VCLXTABPAGEMODEL_HXX
-
-#include <toolkit/dllapi.h>
-#include <com/sun/star/beans/PropertyValues.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/beans/PropertyState.hpp>
-#include <com/sun/star/beans/XPropertySetInfo.hpp>
-#include <toolkit/awt/vclxwindow.hxx>
-#include <toolkit/controls/unocontrolmodel.hxx>
-#include <com/sun/star/awt/tab/XTabPageModel.hpp>
-#include <com/sun/star/awt/tab/XTabPage.hpp>
-#include <cppuhelper/implbase1.hxx>
-// ----------------------------------------------------
-typedef ::cppu::AggImplInheritanceHelper1 < UnoControlModel,
- ::com::sun::star::awt::tab::XTabPageModel
- > VCLXTabPageModel_Base;
-class VCLXTabPageModel : public VCLXTabPageModel_Base
-{
-public:
- VCLXTabPageModel();
- VCLXTabPageModel( const VCLXTabPageModel& rModel ) : VCLXTabPageModel_Base( rModel ) {;}
- ~VCLXTabPageModel();
-
- // ::com::sun::star::awt::XView
- void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException);
-
- // ::com::sun::star::awt::XDevice,
- ::com::sun::star::awt::DeviceInfo SAL_CALL getInfo() throw(::com::sun::star::uno::RuntimeException);
-
- UnoControlModel* Clone() const { return new VCLXTabPageModel( *this ); }
-
- // ::com::sun::star::beans::XMultiPropertySet
- ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException);
- // ::com::sun::star::awt::XVclWindowPeer
- void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException);
-
- // ::com::sun::star::awt::tab::XTabPageModel
- virtual ::sal_Int16 SAL_CALL getTabPageID() throw (::com::sun::star::uno::RuntimeException);
- virtual ::sal_Bool SAL_CALL getEnabled() throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setEnabled( ::sal_Bool _enabled ) throw (::com::sun::star::uno::RuntimeException);
- virtual OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setTitle( const OUString& _title ) throw (::com::sun::star::uno::RuntimeException);
- virtual OUString SAL_CALL getImageURL() throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setImageURL( const OUString& _imageurl ) throw (::com::sun::star::uno::RuntimeException);
- virtual OUString SAL_CALL getToolTip() throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setToolTip( const OUString& _tooltip ) throw (::com::sun::star::uno::RuntimeException);
-protected:
- ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
-};
-#endif // INCLUDED_TOOLKIT_AWT_VCLXTABPAGEMODEL_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/awt/vclxtabpagemodel.cxx b/toolkit/source/awt/vclxtabpagemodel.cxx
deleted file mode 100644
index f84e475..0000000
--- a/toolkit/source/awt/vclxtabpagemodel.cxx
+++ /dev/null
@@ -1,141 +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 <toolkit/awt/vclxtabpagemodel.hxx>
-#include <vcl/tabpage.hxx>
-#include <vcl/tabctrl.hxx>
-#include <toolkit/helper/property.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
-#include <toolkit/helper/unopropertyarrayhelper.hxx>
-#include <cppuhelper/typeprovider.hxx>
-
-// class VCLXDialog
-
-
-VCLXTabPageModel::VCLXTabPageModel()
-{
-}
-
-VCLXTabPageModel::~VCLXTabPageModel()
-{
- OSL_TRACE ("%s", __FUNCTION__);
-}
-
-void SAL_CALL VCLXTabPageModel::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException)
-{
- ::osl::MutexGuard aGuard( GetMutex() );
- Window* pWindow = GetWindow();
-
- if ( pWindow )
- {
- OutputDevice* pDev = VCLUnoHelper::GetOutputDevice( getGraphics() );
- if ( !pDev )
- pDev = pWindow->GetParent();
-
- Size aSize = pDev->PixelToLogic( pWindow->GetSizePixel() );
- Point aPos = pDev->PixelToLogic( Point( nX, nY ) );
-
- pWindow->Draw( pDev, aPos, aSize, WINDOW_DRAW_NOCONTROLS );
- }
-}
-
-::com::sun::star::awt::DeviceInfo VCLXTabPageModel::getInfo() throw(::com::sun::star::uno::RuntimeException)
-{
- ::com::sun::star::awt::DeviceInfo aInfo;// = VCLXDevice::getInfo();
- return aInfo;
-}
-
-
-void SAL_CALL VCLXTabPageModel::setProperty(
- const OUString& /*PropertyName*/,
- const ::com::sun::star::uno::Any& /*Value*/ )
-throw(::com::sun::star::uno::RuntimeException)
-{
- ::osl::MutexGuard aGuard( GetMutex() );
-
- /*TabPage* pTabPage = (TabPage*)GetWindow();
- if ( pTabPage )
- {
- VCLXWindow::setProperty( PropertyName, Value );
- }*/
-}
-//XTabPageModel
-::sal_Int16 SAL_CALL VCLXTabPageModel::getTabPageID() throw (::com::sun::star::uno::RuntimeException)
-{
- return 0;
-}
-::sal_Bool SAL_CALL VCLXTabPageModel::getEnabled() throw (::com::sun::star::uno::RuntimeException)
-{
- return false;
-}
-void SAL_CALL VCLXTabPageModel::setEnabled( ::sal_Bool _enabled ) throw (::com::sun::star::uno::RuntimeException)
-{
- //TabControl* pTabControl = (TabControl*)GetWindow();
- //if ( pTabControl )
- // pTabControl->EnablePage(0, true);
-}
-OUString SAL_CALL VCLXTabPageModel::getTitle() throw (::com::sun::star::uno::RuntimeException)
-{
- //TabControl* pTabControl = (TabControl*)GetWindow();
- //if ( pTabControl )
- // return pTabControl->GetPageText(0);
- //else
- return OUString();
-}
-void SAL_CALL VCLXTabPageModel::setTitle( const OUString& _title ) throw (::com::sun::star::uno::RuntimeException)
-{
- //TabControl* pTabControl = (TabControl*)GetWindow();
- //if ( pTabControl )
- // pTabControl->SetPageText(0, _title);
-
-}
-OUString SAL_CALL VCLXTabPageModel::getImageURL() throw (::com::sun::star::uno::RuntimeException)
-{
- return OUString();
-}
-void SAL_CALL VCLXTabPageModel::setImageURL( const OUString& /*_imageurl*/ ) throw (::com::sun::star::uno::RuntimeException)
-{
- //m_sImageURL = _imageurl;
-}
-OUString SAL_CALL VCLXTabPageModel::getToolTip() throw (::com::sun::star::uno::RuntimeException)
-{
- //return m_sTooltip;
- return OUString();
-}
-void SAL_CALL VCLXTabPageModel::setToolTip( const OUString& _tooltip ) throw (::com::sun::star::uno::RuntimeException)
-{
- (void)_tooltip;
-}
-::cppu::IPropertyArrayHelper& VCLXTabPageModel::getInfoHelper()
-{
- static UnoPropertyArrayHelper* pHelper = NULL;
- if ( !pHelper )
- {
- com::sun::star::uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds();
- pHelper = new UnoPropertyArrayHelper( aIDs );
- }
- return *pHelper;
-}
-::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > VCLXTabPageModel::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException)
-{
- static ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
- return xInfo;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 6cb1829..8a88925 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -74,7 +74,6 @@ using org::libreoffice::touch::ByteBufferWrapper;
#include <toolkit/awt/vclxsystemdependentwindow.hxx>
#include <toolkit/awt/vclxregion.hxx>
#include <toolkit/awt/vclxtabpagecontainer.hxx>
-#include <toolkit/awt/vclxtabpagemodel.hxx>
#include <toolkit/awt/animatedimagespeer.hxx>
#include <toolkit/awt/vclxtopwindow.hxx>
More information about the Libreoffice-commits
mailing list