From eacfa0f77c3d161f3e0c207120dcf3c2958acee4 Mon Sep 17 00:00:00 2001 From: Felix Zhang Date: Tue, 15 Nov 2011 10:13:52 +0800 Subject: removing obsolete layout code --- toolkit/inc/layout/layout-post.hxx | 84 -------------------------------------- toolkit/inc/layout/layout-pre.hxx | 81 ------------------------------------ toolkit/inc/layout/layout.hxx | 7 ---- 3 files changed, 172 deletions(-) delete mode 100644 toolkit/inc/layout/layout-post.hxx delete mode 100644 toolkit/inc/layout/layout-pre.hxx (limited to 'toolkit/inc') diff --git a/toolkit/inc/layout/layout-post.hxx b/toolkit/inc/layout/layout-post.hxx deleted file mode 100644 index da9a052e1b6b..000000000000 --- a/toolkit/inc/layout/layout-post.hxx +++ /dev/null @@ -1,84 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _LAYOUT_POST_HXX -#define _LAYOUT_POST_HXX - -#if ENABLE_LAYOUT - -/* Allow re-inclusion for cxx file. */ -#undef _LAYOUT_PRE_HXX - - -#undef Box -#undef Button -#undef CancelButton -#undef Container -#undef Control -#undef Dialog -#undef Edit -#undef FixedImage -#undef FixedText -#undef HelpButton -#undef IgnoreButton -#undef ListBox -#undef MessBox -#undef MessageBox -#undef MetricFormatter -#undef NoButton -#undef NumericFormatter -#undef PushButton -#undef RetryButton -#undef SfxTabDialog -#undef SfxTabPage -#undef SvxFontListBox -#undef SvxLanguageBox -#undef SpinField -#undef TabDialog -#undef TabControl -#undef TabPage -#undef Table -#undef YesButton - -#undef SvxFontListBox -#undef SvxLanguageBox - -#undef ModalDialog -#undef ModelessDialog -#undef ScExpandedFixedText -#undef SfxDialog -#undef SfxModalDialog -#undef SfxModelessDialog - -#undef Window - -#endif /* ENABLE_LAYOUT */ - -#endif /* _LAYOUT_POST_HXX */ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/toolkit/inc/layout/layout-pre.hxx b/toolkit/inc/layout/layout-pre.hxx deleted file mode 100644 index 9f6b59e3ab2f..000000000000 --- a/toolkit/inc/layout/layout-pre.hxx +++ /dev/null @@ -1,81 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _LAYOUT_PRE_HXX -#define _LAYOUT_PRE_HXX - -#if ENABLE_LAYOUT - -///* Allow re-inclusion for next hxx file. */ -#undef _LAYOUT_POST_HXX - -#define Box layout::Box -#define Button layout::Button -#define CancelButton layout::CancelButton -#define Container layout::Container -#define Control layout::Control -#define Dialog layout::Dialog -#define Edit layout::Edit -#define FixedImage layout::FixedImage -#define FixedText layout::FixedText -#define HelpButton layout::HelpButton -#define IgnoreButton layout::IgnoreButton -#define ListBox layout::ListBox -#define MessBox layout::MessBox -#define MessageBox layout::MessageBox -#define MetricFormatter layout::MetricFormatter -#define NoButton layout::NoButton -#define NumericFormatter layout::NumericFormatter -#define PushButton layout::PushButton -#define RetryButton layout::RetryButton -#define SfxTabDialog layout::SfxTabDialog -#define SfxTabPage layout::SfxTabPage -#define SvxFontListBox layout::SvxFontListBox -#define SvxLanguageBox layout::SvxLanguageBox -#define TabControl layout::TabControl -#define TabPage layout::TabPage -#define Table layout::Table -#define YesButton layout::YesButton - -#define ModalDialog Dialog -#define ModelessDialog Dialog -#define ScExpandedFixedText FixedText -#define SfxDialog Dialog -#define SfxModalDialog Dialog -#define SfxModelessDialog Dialog -#define TabDialog Dialog - -#define Window ::Window - -#endif /* ENABLE_LAYOUT */ - -#define LocalizedString String - -#endif /* _LAYOUT_PRE_HXX */ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/toolkit/inc/layout/layout.hxx b/toolkit/inc/layout/layout.hxx index 658b34fcdc36..986ae5f10e97 100644 --- a/toolkit/inc/layout/layout.hxx +++ b/toolkit/inc/layout/layout.hxx @@ -490,16 +490,9 @@ class TOOLKIT_DLLPUBLIC InPlug : public Context, public Window } // end namespace layout -#if ENABLE_LAYOUT -#define LAYOUT_NS layout:: -#define LAYOUT_DIALOG_PARENT\ - VCLXWindow::GetImplementation( uno::Reference ( GetPeer(), uno::UNO_QUERY ) )->GetWindow() -#define LAYOUT_THIS_WINDOW( this ) this->GetWindow () -#else /* !ENABLE_LAYOUT */ #define LAYOUT_NS #define LAYOUT_DIALOG_PARENT this #define LAYOUT_THIS_WINDOW( this ) this -#endif /* !ENABLE_LAYOUT */ #endif /* _LAYOUT_HXX */ -- cgit