diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-01-12 22:29:24 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-01-13 09:05:59 +0000 |
commit | 6248f7037c6d034a352566457ebbab29ea9d817c (patch) | |
tree | ee5e6d7cb6a902369b7ce46ee092acd62bea30d2 /svx | |
parent | bb59742bcf4883af5876a2ffadcc4a689e414b60 (diff) |
svxempty.* not needed anymore
Diffstat (limited to 'svx')
-rw-r--r-- | svx/Library_svx.mk | 1 | ||||
-rw-r--r-- | svx/inc/svxempty.hxx | 46 | ||||
-rw-r--r-- | svx/source/engine3d/scene3d.cxx | 4 | ||||
-rw-r--r-- | svx/source/items/svxempty.cxx | 40 |
4 files changed, 1 insertions, 90 deletions
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index 2057d953b688..d81363aa9542 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -166,7 +166,6 @@ $(eval $(call gb_Library_add_exception_objects,svx,\ svx/source/items/postattr \ svx/source/items/rotmodit \ svx/source/items/SmartTagItem \ - svx/source/items/svxempty \ svx/source/items/svxerr \ svx/source/items/viewlayoutitem \ svx/source/items/zoomitem \ diff --git a/svx/inc/svxempty.hxx b/svx/inc/svxempty.hxx deleted file mode 100644 index 46849643f726..000000000000 --- a/svx/inc/svxempty.hxx +++ /dev/null @@ -1,46 +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 _SVXEMPTY_HXX -#define _SVXEMPTY_HXX - - -#include <tools/string.hxx> - -#ifndef ICC -extern XubString& rImplEmptyStr; -inline const XubString& GetEmptyStr() { return rImplEmptyStr; } -#define GetEmptySStr GetEmptyStr -#else -const XubString& GetEmptyStr(); -#define GetEmptySStr GetEmptyStr -#endif - - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx index e5af47801e12..b268213873d8 100644 --- a/svx/source/engine3d/scene3d.cxx +++ b/svx/source/engine3d/scene3d.cxx @@ -31,10 +31,8 @@ #include "svx/svdglob.hxx" #include "svx/svditer.hxx" -#if defined( UNX ) || defined( ICC ) #include <stdlib.h> -#endif -#include "svx/globl3d.hxx" +#include <svx/globl3d.hxx> #include <svx/svdpage.hxx> #include <svl/style.hxx> #include <svx/scene3d.hxx> diff --git a/svx/source/items/svxempty.cxx b/svx/source/items/svxempty.cxx deleted file mode 100644 index 1c85f20fa066..000000000000 --- a/svx/source/items/svxempty.cxx +++ /dev/null @@ -1,40 +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 "svxempty.hxx" - -// Statischer Empty-String ----------------------------------------------- - -static XubString aImplSVXEmptyStr; -XubString& rImplEmptyStr = aImplSVXEmptyStr; -static String aImplSVXEmptySStr; -String& rImplEmptySStr = aImplSVXEmptySStr; - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |