diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2009-01-21 14:22:27 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2009-01-21 14:22:27 +0000 |
commit | da2cac30aada8a34b7edfe56298fd873e1cd3d71 (patch) | |
tree | 6f2cb0ba97f20f6203ac0fd76da87453fcafa6f6 | |
parent | CWS-TOOLING: integrate CWS jl111 (diff) | |
download | core-da2cac30aada8a34b7edfe56298fd873e1cd3d71.tar.gz core-da2cac30aada8a34b7edfe56298fd873e1cd3d71.zip |
CWS-TOOLING: integrate CWS sjfixes10
2009-01-15 14:02:24 +0100 af r266369 : #i88851# Finding the right font size is now an iterative process.
2009-01-15 11:01:59 +0100 wg r266354 : i97985
2009-01-15 10:57:33 +0100 wg r266353 : i97985
2009-01-15 10:48:53 +0100 wg r266347 : i97985
2009-01-15 10:48:23 +0100 wg r266346 : i97985
2009-01-15 10:46:47 +0100 wg r266345 : i97985
2009-01-15 10:45:43 +0100 wg r266344 : i97985
2009-01-15 10:45:14 +0100 wg r266343 : i97985
2009-01-15 10:44:38 +0100 wg r266342 : i97985
2009-01-15 10:43:56 +0100 wg r266341 : i97985
2009-01-15 10:42:50 +0100 wg r266340 : i97985
2009-01-15 10:41:40 +0100 wg r266339 : i97985
2009-01-15 10:39:46 +0100 wg r266337 : i97985
2009-01-15 10:00:09 +0100 hde r266336 : i98065
2009-01-13 15:48:20 +0100 wg r266232 : i97985
2009-01-13 13:22:05 +0100 wg r266217 : i97985
2009-01-13 12:34:05 +0100 wg r266210 : i97985
2009-01-13 12:30:56 +0100 wg r266209 : i97985
2009-01-13 12:26:56 +0100 wg r266208 : i97985
2009-01-12 15:58:06 +0100 wg r266165 : i97985
2009-01-12 15:43:24 +0100 wg r266163 : i97985
2009-01-08 16:21:47 +0100 sj r266023 : fixed warning
2009-01-08 15:33:34 +0100 sj r266017 : fixed warning
2009-01-06 18:13:42 +0100 sj r265935 : CWS-TOOLING: rebase CWS sjfixes10 to trunk@265758 (milestone: DEV300:m38)
2008-12-10 16:54:02 +0100 af r265206 : #i43354# Do not delete all unused master pages automatically.
2008-12-04 13:12:50 +0100 af r264836 : #i92795# Use BitmapEx for icons to allow transparency.
2008-12-02 17:01:49 +0100 af r264723 : #i93082# Fixed SID_INSERTPAGE_LAYOUT_MENU.
2008-11-28 14:37:28 +0100 af r264555 : #i88851# Changed association of Ctrl-'?' to views.
2008-11-28 11:38:52 +0100 af r264535 : #i96681# Set version to 1.0.2
2008-11-28 11:30:04 +0100 af r264533 : #i88851# Ctrl-1,2,3 switch to slide overview, notes, normal view.
2008-11-27 16:41:25 +0100 af r264505 : #i92144# Removed unused code.
2008-11-26 15:29:56 +0100 af r264401 : #i92574# Do not lock configuration controller when main pane is not available.
2008-11-21 10:13:40 +0100 sj r264112 : #i96146# applied patch (ambiguous && ||)
2008-11-20 20:12:06 +0100 sj r264097 : #i96083# applied patch (ambigous && ||)
2008-11-20 19:13:53 +0100 sj r264096 : #i96163# applied patch (ambigous && ||)
2008-11-20 18:39:10 +0100 sj r264093 : #i96165# applied patch (ambigous && ||)
2008-11-03 18:12:29 +0100 sj r263303 : #i93996# fixed word wrapping problem
2008-11-03 18:11:02 +0100 sj r263302 : #i93996# fixed word wrapping problem
2008-11-03 18:08:41 +0100 sj r263301 : #i93996# fixed word wrapping problem
2008-11-03 18:06:45 +0100 sj r263300 : #i93996# fixed word wrapping problem
2008-11-03 18:05:00 +0100 sj r263299 : #i94831,i93616# fixed crash when importing diagonal cell border lines, fixed table import
2008-11-03 18:00:43 +0100 sj r263298 : #i93718# spellchecking is no longer triggering the autolayout of connector objects
-rw-r--r-- | xmloff/inc/xmloff/WordWrapPropertyHdl.hxx | 56 | ||||
-rw-r--r-- | xmloff/source/draw/sdpropls.cxx | 3 | ||||
-rw-r--r-- | xmloff/source/style/WordWrapPropertyHdl.cxx | 106 | ||||
-rw-r--r-- | xmloff/source/style/makefile.mk | 1 |
4 files changed, 165 insertions, 1 deletions
diff --git a/xmloff/inc/xmloff/WordWrapPropertyHdl.hxx b/xmloff/inc/xmloff/WordWrapPropertyHdl.hxx new file mode 100644 index 000000000000..ee0be918dd22 --- /dev/null +++ b/xmloff/inc/xmloff/WordWrapPropertyHdl.hxx @@ -0,0 +1,56 @@ +/************************************************************************* + * + * 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.hxx,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. + * + ************************************************************************/ + +#ifndef _XMLOFF_WORDWRAPPROPERTYHANDLER_HXX +#define _XMLOFF_WORDWRAPPROPERTYHANDLER_HXX + +#include <xmloff/xmlprhdl.hxx> +#include <xmloff/xmltoken.hxx> +#include <com/sun/star/uno/Type.h> +#include <xmloff/xmlement.hxx> + +/** + PropertyHandler for a named xml bool type: +*/ +class SvXMLImport; +class XMLWordWrapPropertyHdl : public XMLPropertyHandler +{ +private: + SvXMLImport* mpImport; + +public: + XMLWordWrapPropertyHdl( SvXMLImport* pImport ); + virtual ~XMLWordWrapPropertyHdl(); + + virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; +}; + +#endif // _XMLOFF_NAMEDBOOLPROPERTYHANDLER_HXX diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx index 2cede47df320..678efc8dae5a 100644 --- a/xmloff/source/draw/sdpropls.cxx +++ b/xmloff/source/draw/sdpropls.cxx @@ -48,6 +48,7 @@ #include <com/sun/star/text/WritingMode.hpp> #include <xmloff/EnumPropertyHdl.hxx> #include <xmloff/NamedBoolPropertyHdl.hxx> +#include <xmloff/WordWrapPropertyHdl.hxx> #include "numithdl.hxx" #include "XMLBitmapRepeatOffsetPropertyHandler.hxx" #include "XMLFillBitmapSizePropertyHandler.hxx" @@ -1136,7 +1137,7 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy pHdl = new XMLNamedBoolPropertyHdl( GetXMLToken(XML_FORWARD), GetXMLToken(XML_REVERSE) ); break; case XML_TYPE_WRAP_OPTION: - pHdl = new XMLNamedBoolPropertyHdl( GetXMLToken( XML_WRAP ), GetXMLToken( XML_NO_WRAP ) ); + pHdl = new XMLWordWrapPropertyHdl( mpImport ); break; case XML_SD_TYPE_MOVE_PROTECT: diff --git a/xmloff/source/style/WordWrapPropertyHdl.cxx b/xmloff/source/style/WordWrapPropertyHdl.cxx new file mode 100644 index 000000000000..128efe4a2a8b --- /dev/null +++ b/xmloff/source/style/WordWrapPropertyHdl.cxx @@ -0,0 +1,106 @@ +/************************************************************************* + * + * 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 da4526b886db..83e3e8b42ab6 100644 --- a/xmloff/source/style/makefile.mk +++ b/xmloff/source/style/makefile.mk @@ -209,6 +209,7 @@ SLOFILES = \ $(SLO)$/PagePropertySetContext.obj \ $(SLO)$/PageHeaderFooterContext.obj \ $(SLO)$/StyleMap.obj \ + $(SLO)$/WordWrapPropertyHdl.obj \ $(SLO)$/XMLBitmapRepeatOffsetPropertyHandler.obj \ $(SLO)$/XMLFillBitmapSizePropertyHandler.obj \ $(SLO)$/XMLBitmapLogicalSizePropertyHandler.obj \ |