diff options
author | Sven Jacobi <sj@openoffice.org> | 2008-10-29 13:19:07 +0000 |
---|---|---|
committer | Sven Jacobi <sj@openoffice.org> | 2008-10-29 13:19:07 +0000 |
commit | bcf451a50b85f77aaff3ddfb86a67916e14609d9 (patch) | |
tree | 8bdfb6999c3cce21b067572e80ee0a4bf205774e | |
parent | d641a99e59f1fc5ffa8d8a1fadba836fbb24d6a2 (diff) |
undoing change committed in r262792 & 262789
-rw-r--r-- | xmloff/source/style/WordWrapPropertyHdl.cxx | 106 | ||||
-rw-r--r-- | xmloff/source/style/makefile.mk | 1 |
2 files changed, 0 insertions, 107 deletions
diff --git a/xmloff/source/style/WordWrapPropertyHdl.cxx b/xmloff/source/style/WordWrapPropertyHdl.cxx deleted file mode 100644 index eec884771f..0000000000 --- a/xmloff/source/style/WordWrapPropertyHdl.cxx +++ /dev/null @@ -1,106 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: WordWrapPropertyHdl.cxx,v $ - * $Revision: 1.1.2.1 $ - * - * 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_xmloff.hxx" -#include <xmloff/xmlimp.hxx> -#include <xmloff/WordWrapPropertyHdl.hxx> -#include "xmlkywd.hxx" -#include <xmloff/xmltoken.hxx> -#include <xmloff/xmluconv.hxx> -#include <comphelper/extract.hxx> -#include <rtl/ustring.hxx> -#include <rtl/ustrbuf.hxx> -#include <com/sun/star/uno/Any.hxx> - -using ::rtl::OUString; -using ::rtl::OUStringBuffer; - -using namespace ::com::sun::star::uno; - -/////////////////////////////////////////////////////////////////////////////// -// -// class XMLWordWrapPropertyHdl -// - -XMLWordWrapPropertyHdl::XMLWordWrapPropertyHdl( SvXMLImport* pImport ) -: mpImport( pImport ) -{ -} - -XMLWordWrapPropertyHdl::~XMLWordWrapPropertyHdl() -{ - // Nothing to do -} - -sal_Bool XMLWordWrapPropertyHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const -{ - sal_Bool bValue = sal_False, bRetValue = sal_False; - if( rStrImpValue == GetXMLToken( xmloff::token::XML_WRAP ) ) - { - bValue = sal_True; - bRetValue = sal_True; - } - if( rStrImpValue == GetXMLToken( xmloff::token::XML_NO_WRAP ) ) - { - bValue = sal_False; - bRetValue = sal_True; - } - if ( bRetValue && mpImport ) - { - sal_Int32 nUPD, nBuildId; - if( mpImport->getBuildIds( nUPD, nBuildId ) ) - { - if( nUPD == 300 ) - { - if( ( nBuildId > 0 ) && (nBuildId < 9316 ) ) - bValue = bValue ? sal_False : sal_True; // treat OOo 3.0 beta1 as OOo 2.x - } - else if( ( nUPD == 680 ) || ( nUPD >= 640 && nUPD <= 645 ) ) - bValue = bValue ? sal_False : sal_True; - } - rValue <<= bValue; - } - return bRetValue; -} - -sal_Bool XMLWordWrapPropertyHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const -{ - if( ::cppu::any2bool( rValue ) ) - { - rStrExpValue = GetXMLToken( xmloff::token::XML_WRAP ); - } - else - { - rStrExpValue = GetXMLToken( xmloff::token::XML_NO_WRAP ); - } - return sal_True; -} - diff --git a/xmloff/source/style/makefile.mk b/xmloff/source/style/makefile.mk index 83e3e8b42a..da4526b886 100644 --- a/xmloff/source/style/makefile.mk +++ b/xmloff/source/style/makefile.mk @@ -209,7 +209,6 @@ SLOFILES = \ $(SLO)$/PagePropertySetContext.obj \ $(SLO)$/PageHeaderFooterContext.obj \ $(SLO)$/StyleMap.obj \ - $(SLO)$/WordWrapPropertyHdl.obj \ $(SLO)$/XMLBitmapRepeatOffsetPropertyHandler.obj \ $(SLO)$/XMLFillBitmapSizePropertyHandler.obj \ $(SLO)$/XMLBitmapLogicalSizePropertyHandler.obj \ |