summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorFelix Zhang <fezhang@suse.com>2011-11-16 17:27:21 +0800
committerJan Holesovsky <kendy@suse.cz>2011-11-17 00:49:48 +0100
commit38b42cee869c573dcdd9af2538a143edf9f18d33 (patch)
treea4a44fe2001321efc3fab746d24edfd22ba29ceb /sfx2
parent4f11d0aa461537efa2705e7b49bc2c828a700e43 (diff)
remove obsolete layout code
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/Package_inc.mk1
-rw-r--r--sfx2/inc/sfx2/layout.hxx64
-rw-r--r--sfx2/source/layout/factory.cxx71
-rw-r--r--sfx2/source/layout/sfxdialog.cxx41
-rw-r--r--sfx2/source/layout/sfxtabdialog.cxx74
-rw-r--r--sfx2/source/layout/sfxtabpage.cxx68
6 files changed, 0 insertions, 319 deletions
diff --git a/sfx2/Package_inc.mk b/sfx2/Package_inc.mk
index 67bb1c45d73c..4dd559d4a65f 100644
--- a/sfx2/Package_inc.mk
+++ b/sfx2/Package_inc.mk
@@ -75,7 +75,6 @@ $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imgmgr.hxx,sfx2/imgmgr.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/ipclient.hxx,sfx2/ipclient.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/itemconnect.hxx,sfx2/itemconnect.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/itemwrapper.hxx,sfx2/itemwrapper.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout.hxx,sfx2/layout.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/linkmgr.hxx,sfx2/linkmgr.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/linksrc.hxx,sfx2/linksrc.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/lnkbase.hxx,sfx2/lnkbase.hxx))
diff --git a/sfx2/inc/sfx2/layout.hxx b/sfx2/inc/sfx2/layout.hxx
deleted file mode 100644
index a8540ecbd430..000000000000
--- a/sfx2/inc/sfx2/layout.hxx
+++ /dev/null
@@ -1,64 +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
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ***********************************************************************/
-
-#ifndef _SFX2_LAYOUT_HXX
-#define _SFX2_LAYOUT_HXX
-
-#include <layout/layout.hxx>
-#include <sfx2/tabdlg.hxx>
-
-class SfxChildWindow;
-class SfxBindings;
-
-namespace layout
-{
-
-class SFX2_DLLPUBLIC SfxDialog
- : public Dialog
-{
-public:
- SfxDialog (::Window* parent, char const* xml_file, char const* id, SfxBindings* bindings=0, SfxChildWindow* child=0);
-};
-
-class SFX2_DLLPUBLIC SfxTabPage
- : public ::SfxTabPage
- , public InPlug
-{
-public:
- SfxTabPage (::Window *parent, char const* xml_file, char const* id, SfxItemSet const* set=0);
- ::Window* GetParent () const;
- using ::Window::GetWindow;
- ::Window* GetWindow () const;
- Size GetOptimalSize (WindowSizeType eType) const;
- void FreeResource ();
-};
-} // end namespace layout
-
-#endif /* _SFX2_LAYOUT_HXX */
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/layout/factory.cxx b/sfx2/source/layout/factory.cxx
deleted file mode 100644
index a5a00227eecf..000000000000
--- a/sfx2/source/layout/factory.cxx
+++ /dev/null
@@ -1,71 +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
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <com/sun/star/awt/WindowAttribute.hpp>
-#include <sal/types.h>
-#include <sfx2/basedlgs.hxx>
-#include <toolkit/awt/vclxtoolkit.hxx>
-#include <toolkit/awt/vclxdialog.hxx>
-
-using rtl::OUString;
-
-class SfxModelessDialog_unprotect : public SfxModelessDialog
-{
-public:
- SfxModelessDialog_unprotect (Window *parent, WinBits attributes);
-};
-
-SFX2_DLLPUBLIC SfxBindings* sfx2_global_bindings;
-SFX2_DLLPUBLIC SfxChildWindow* sfx2_global_child;
-
-SfxModelessDialog_unprotect::SfxModelessDialog_unprotect (Window *parent, WinBits bits)
- : SfxModelessDialog (sfx2_global_bindings, sfx2_global_child, parent, bits)
-{
-}
-
-extern "C"
-{
-
-SAL_DLLPUBLIC_EXPORT Window* CreateWindow (VCLXWindow** vcl, OUString const& name, Window* parent, long& attributes)
-{
- Window* window = 0;
- if (0)
- {
- ;
- }
- else if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sfxmodelessdialog")))
- {
- window = new SfxModelessDialog_unprotect (parent, ImplGetWinBits (attributes, 0));
- *vcl = new layoutimpl::VCLXDialog ();
- }
- return window;
-}
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/layout/sfxdialog.cxx b/sfx2/source/layout/sfxdialog.cxx
deleted file mode 100644
index e8eb980c0466..000000000000
--- a/sfx2/source/layout/sfxdialog.cxx
+++ /dev/null
@@ -1,41 +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
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#include "precompiled_sfx2.hxx"
-#include <sfx2/layout.hxx>
-
-namespace layout
-{
-
-SfxDialog::SfxDialog(::Window* parent, char const* xml_file, char const* id, SfxBindings*, SfxChildWindow*)
- : Dialog (parent, xml_file, id)
-{
-}
-
-} // end namespace layout
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/layout/sfxtabdialog.cxx b/sfx2/source/layout/sfxtabdialog.cxx
deleted file mode 100644
index 2e7d1aa476f3..000000000000
--- a/sfx2/source/layout/sfxtabdialog.cxx
+++ /dev/null
@@ -1,74 +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
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sfx2.hxx"
-
-#include <limits.h>
-#include <stdlib.h>
-#include <vcl/msgbox.hxx>
-#include <unotools/viewoptions.hxx>
-
-#define _SVSTDARR_USHORTS
-#include <svl/svstdarr.hxx>
-
-#include "appdata.hxx"
-#include "sfxtypes.hxx"
-#include <sfx2/minarray.hxx>
-#include <sfx2/tabdlg.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <sfx2/app.hxx>
-#include "sfx2/sfxresid.hxx"
-#include "sfx2/sfxhelp.hxx"
-#include <sfx2/ctrlitem.hxx>
-#include <sfx2/bindings.hxx>
-#include <sfx2/sfxdlg.hxx>
-#include <sfx2/itemconnect.hxx>
-#include <layout/layout.hxx>
-
-//FIXME
-#include <toolkit/awt/vclxwindow.hxx>
-#include <com/sun/star/awt/PosSize.hpp>
-
-using namespace ::com::sun::star;
-namespace layout
-{
-using namespace ::com::sun::star;
-}
-
-#include <sfx2/layout.hxx>
-
-#undef TabPage
-#undef SfxTabPage
-#undef SfxTabDialog
-
-#define TabDlgCmpUS_Impl layout__TabDlgCmpUS_Impl
-
-#include "../dialog/tabdlg.cxx"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/layout/sfxtabpage.cxx b/sfx2/source/layout/sfxtabpage.cxx
deleted file mode 100644
index 7c40d6f0b190..000000000000
--- a/sfx2/source/layout/sfxtabpage.cxx
+++ /dev/null
@@ -1,68 +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
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ***********************************************************************/
-
-#include <sfx2/layout.hxx>
-
-#include <com/sun/star/awt/PosSize.hpp>
-#include <toolkit/awt/vclxwindow.hxx>
-
-namespace layout
-{
-
-using namespace ::com::sun::star;
-
-SfxTabPage::SfxTabPage (::Window *parent, char const* xml_file, char const* id, SfxItemSet const* set)
- : ::SfxTabPage (parent, 0, *set)
- , InPlug (parent, xml_file, id)
-{
- dynamic_cast< ::Window* > (this)->SetComponentInterface (GetVCLXWindow ());
-}
-
-::Window* SfxTabPage::GetParent () const
-{
- return Window::GetParent ();
-}
-
-::Window* SfxTabPage::GetWindow () const
-{
- return ::layout::Window::GetWindow();
-}
-
-void SfxTabPage::FreeResource ()
-{
-}
-
-Size SfxTabPage::GetOptimalSize (WindowSizeType) const
-{
- awt::Size s = GetVCLXWindow()->getMinimumSize ();
- return Size (s.Width, s.Height);
-}
-
-} // end namespace layout
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */