strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS xmlfilter03_DEV300 (1.2.4); FILE MERGED

Browse source 
2008/02/01 09:54:59 dr 1.2.4.1: addShape() code cleanup, started xlsx drawing import
This commit is contained in:
Kurt Zenker 2008-03-05 17:30:52 +00:00
parent 078eeeaea8
commit 1772f6594e
4 changed files with 33 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
oox/source/drawingml/textbody.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: textbody.cxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: rt $ $Date: 2008-01-17 08:05:52 $
* last change: $Author: kz $ $Date: 2008-03-05 18:27:14 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -57,8 +57,11 @@ namespace oox { namespace drawingml {
void TextBody::insertAt( const ::oox::core::XmlFilterBase& rFilterBase, const Reference < XText > & xText, const Reference < XTextCursor > & xAt,
const Reference < XModel > &xModel, const TextListStylePtr& pMasterTextListStylePtr )
void TextBody::insertAt(
const ::oox::core::XmlFilterBase& rFilterBase,
const Reference < XText > & xText,
const Reference < XTextCursor > & xAt,
const TextListStylePtr& pMasterTextListStylePtr )
{
TextListStylePtr aCombinedTextStyle( new TextListStyle( *(pMasterTextListStylePtr.get()) ) );
aCombinedTextStyle->apply( mpTextListStyle );
@ -69,7 +72,7 @@ namespace oox { namespace drawingml {
// expected behavior.
while( begin != end )
{
(*begin)->insertAt( rFilterBase, xText, xAt, xModel, aCombinedTextStyle, begin == maParagraphs.begin() );
(*begin)->insertAt( rFilterBase, xText, xAt, aCombinedTextStyle, begin == maParagraphs.begin() );
begin++;
/*
std::for_each( begin, end,

15
oox/source/drawingml/textfield.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: textfield.cxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: rt $ $Date: 2008-01-17 08:05:52 $
* last change: $Author: kz $ $Date: 2008-03-05 18:28:29 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -141,10 +141,11 @@ namespace oox { namespace drawingml {
}
}
void TextField::insertAt( const ::oox::core::XmlFilterBase& rFilterBase, const Reference < XText > & xText,
const Reference < XTextCursor > &xAt,
const Reference< XModel > &xModel,
const TextCharacterPropertiesPtr& rTextCharacterStyle )
void TextField::insertAt(
const ::oox::core::XmlFilterBase& rFilterBase,
const Reference < XText > & xText,
const Reference < XTextCursor > &xAt,
const TextCharacterPropertiesPtr& rTextCharacterStyle )
{
try {
@ -159,7 +160,7 @@ namespace oox { namespace drawingml {
maTextCharacterPropertiesPtr->pushToPropSet( rFilterBase, xProps );
std::list< Reference< XTextField > > fields;
createTextFields( fields, xModel, msType );
createTextFields( fields, rFilterBase.getModel(), msType );
if( !fields.empty() )
{
bool bFirst = true;

15
oox/source/drawingml/textparagraph.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: textparagraph.cxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: rt $ $Date: 2008-01-17 08:05:52 $
* last change: $Author: kz $ $Date: 2008-03-05 18:29:58 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -65,15 +65,18 @@ namespace oox { namespace drawingml {
}
void TextParagraph::insertAt( const ::oox::core::XmlFilterBase& rFilterBase, const Reference < XText > &xText, const Reference < XTextCursor > &xAt, const Reference < XModel > &xModel,
const TextListStylePtr& rTextStyleList, bool bFirst)
void TextParagraph::insertAt(
const ::oox::core::XmlFilterBase& rFilterBase,
const Reference < XText > &xText,
const Reference < XTextCursor > &xAt,
const TextListStylePtr& rTextStyleList, bool bFirst)
{
try {
sal_Int32 nParagraphSize = 0;
Reference< XTextRange > xStart( xAt, UNO_QUERY );
sal_Int16 nLevel = mpProperties->getLevel();
std::vector< ::oox::drawingml::TextParagraphPropertiesPtr >& rListStyle = rTextStyleList->getListStyle();
std::vector< TextParagraphPropertiesPtr >& rListStyle = rTextStyleList->getListStyle();
if ( nLevel >= static_cast< sal_Int16 >( rListStyle.size() ) )
nLevel = 0;
TextParagraphPropertiesPtr pTextParagraphStyle;
@ -92,7 +95,7 @@ namespace oox { namespace drawingml {
std::vector< TextRunPtr >::iterator begin( maRuns.begin() );
while( begin != maRuns.end() )
{
(*begin)->insertAt( rFilterBase, xText, xAt, xModel, pTextCharacterStyle );
(*begin)->insertAt( rFilterBase, xText, xAt, pTextCharacterStyle );
nParagraphSize += (*begin++)->text().getLength();
}
xAt->gotoEnd(true);

13
oox/source/drawingml/textrun.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: textrun.cxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: rt $ $Date: 2008-01-17 08:05:52 $
* last change: $Author: kz $ $Date: 2008-03-05 18:30:52 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -64,8 +64,11 @@ namespace oox { namespace drawingml {
{
}
void TextRun::insertAt( const ::oox::core::XmlFilterBase& rFilterBase, const Reference < XText > & xText, const Reference < XTextCursor > &xAt,
const Reference < XModel > & xModel, const TextCharacterPropertiesPtr& rTextCharacterStyle )
void TextRun::insertAt(
const ::oox::core::XmlFilterBase& rFilterBase,
const Reference < XText > & xText,
const Reference < XTextCursor > &xAt,
const TextCharacterPropertiesPtr& rTextCharacterStyle )
{
try {
Reference< XTextRange > xStart( xAt, UNO_QUERY );
@ -91,7 +94,7 @@ namespace oox { namespace drawingml {
else
{
OSL_TRACE( "OOX: URL field" );
Reference< XMultiServiceFactory > xFactory( xModel, UNO_QUERY );
Reference< XMultiServiceFactory > xFactory( rFilterBase.getModel(), UNO_QUERY );
Reference< XTextField > xField( xFactory->createInstance( CREATE_OUSTRING( "com.sun.star.text.TextField.URL" ) ), UNO_QUERY );
if( xField.is() )
{