[ooo-build-commit] .: 3 commits - filter/source oox/inc oox/source oox/util
Jan Holesovsky
kendy at kemper.freedesktop.org
Fri Sep 17 03:35:55 PDT 2010
filter/source/msfilter/svdfppt.cxx | 12 +++++++++++-
oox/inc/oox/export/drawingml.hxx | 2 +-
oox/inc/oox/export/vmlexport.hxx | 2 +-
oox/source/export/drawingml.cxx | 7 ++++---
oox/source/export/preset-definitions-to-shape-types.pl | 2 +-
oox/source/export/shapes.cxx | 4 ++--
oox/source/export/vmlexport.cxx | 4 ++--
oox/util/makefile.mk | 4 +++-
8 files changed, 25 insertions(+), 12 deletions(-)
New commits:
commit f770cfea0aaf33171d554a7e1b7254e3cdf57100
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Sep 17 12:29:59 2010 +0200
Fix the build of oox.
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 8789b80..ddd4bea 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -60,13 +60,14 @@
#include <tools/string.hxx>
#include <vcl/cvtgrf.hxx>
#include <unotools/fontcvt.hxx>
+#include <unotools/fontdefs.hxx>
#include <vcl/graph.hxx>
#include <svtools/grfmgr.hxx>
#include <rtl/strbuf.hxx>
#include <sfx2/app.hxx>
#include <svl/languageoptions.hxx>
-#include <svx/escherex.hxx>
-#include <svx/svxenum.hxx>
+#include <filter/msfilter/escherex.hxx>
+#include <editeng/svxenum.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -473,7 +474,7 @@ OUString DrawingML::WriteImage( const Graphic& rGraphic )
}
aData = aStream.GetData();
- nDataSize = aStream.GetSize();
+ nDataSize = aStream.GetEndOfData();
break;
}
}
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 7dafac4..df32315 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -66,9 +66,9 @@
#include <rtl/strbuf.hxx>
#include <sfx2/app.hxx>
#include <svl/languageoptions.hxx>
-#include <svx/escherex.hxx>
+#include <filter/msfilter/escherex.hxx>
#include <svx/svdoashp.hxx>
-#include <svx/svxenum.hxx>
+#include <editeng/svxenum.hxx>
#include <svx/unoapi.hxx>
using namespace ::com::sun::star;
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index c26062c..4afac28 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -128,7 +128,7 @@ void VMLExport::CloseContainer()
UINT32 VMLExport::EnterGroup( const String& rShapeName, const Rectangle* pRect )
{
- UINT32 nShapeId = GetShapeID();
+ sal_uInt32 nShapeId = GenerateShapeId();
OStringBuffer aStyle( 200 );
FastAttributeList *pAttrList = m_pSerializer->createAttrList();
diff --git a/oox/util/makefile.mk b/oox/util/makefile.mk
index deb8dbb..a8ba80c 100644
--- a/oox/util/makefile.mk
+++ b/oox/util/makefile.mk
@@ -75,7 +75,9 @@ SHL1STDLIBS= \
$(GOODIESLIB) \
$(SVTOOLLIB) \
$(SVXCORELIB) \
- $(SVXMSFILTERLIB) \
+ $(SVLLIB) \
+ $(MSFILTERLIB) \
+ $(UNOTOOLSLIB) \
$(TOOLSLIB)
# link openssl, copied this bit from ucb/source/ucp/webdav/makefile.mk
commit d30812a59dfb820c4939064bdc30a0f162983793
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Sep 17 12:28:17 2010 +0200
oox-build-fix-dev300-m77.diff: Partial fix of the oox build.
diff --git a/oox/inc/oox/export/drawingml.hxx b/oox/inc/oox/export/drawingml.hxx
index 0859b15..dbedb1b 100644
--- a/oox/inc/oox/export/drawingml.hxx
+++ b/oox/inc/oox/export/drawingml.hxx
@@ -7,7 +7,7 @@
#include <com/sun/star/awt/FontDescriptor.hpp>
#include <com/sun/star/uno/XReference.hpp>
#include <tools/poly.hxx>
-#include <svx/escherex.hxx>
+#include <filter/msfilter/escherex.hxx>
class Graphic;
class String;
diff --git a/oox/inc/oox/export/vmlexport.hxx b/oox/inc/oox/export/vmlexport.hxx
index b749297..cde0224 100644
--- a/oox/inc/oox/export/vmlexport.hxx
+++ b/oox/inc/oox/export/vmlexport.hxx
@@ -27,7 +27,7 @@
#include <oox/dllapi.h>
#include <sax/fshelper.hxx>
-#include <svx/escherex.hxx>
+#include <filter/msfilter/escherex.hxx>
namespace rtl {
class OString;
diff --git a/oox/source/export/preset-definitions-to-shape-types.pl b/oox/source/export/preset-definitions-to-shape-types.pl
index 0dc98c1..bc5163b 100644
--- a/oox/source/export/preset-definitions-to-shape-types.pl
+++ b/oox/source/export/preset-definitions-to-shape-types.pl
@@ -1204,7 +1204,7 @@ print <<EOF;
// '$src_text'
// which are part of the OOXML documentation
-#include <svx/escherex.hxx>
+#include <filter/msfilter/escherex.hxx>
const char* pShapeTypes[ ESCHER_ShpInst_COUNT ] =
{
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index 6da08a2..c26062c 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -64,7 +64,7 @@ public:
};
VMLExport::VMLExport( ::sax_fastparser::FSHelperPtr pSerializer )
- : EscherEx( *( new SvNullStream ), 0 ),
+ : EscherEx( EscherExGlobalRef(new EscherExGlobal(0)), *( new SvNullStream ) ),
m_pSerializer( pSerializer ),
m_pShapeAttrList( NULL ),
m_nShapeType( ESCHER_ShpInst_Nil ),
commit 64a75b5164f441a9d5f0c5fc0e490ba24f8ae96a
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Fri Sep 17 10:11:28 2010 +0200
fit-list-to-size.diff: Shrink font automatically when text overflows.
i#94086
Scale-font-down if typing text in Impress and the text box becomes too small.
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index e21a9f1..e2c6b06 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -1115,6 +1115,7 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
}
aTextObj.SetDestinationInstance( (sal_uInt16)nDestinationInstance );
+ bool bAutoFit = false; // auto-scale text into shape box
switch ( aTextObj.GetInstance() )
{
case TSS_TYPE_PAGETITLE :
@@ -1122,7 +1123,7 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
case TSS_TYPE_SUBTITLE : eTextKind = OBJ_TEXT; break;
case TSS_TYPE_BODY :
case TSS_TYPE_HALFBODY :
- case TSS_TYPE_QUARTERBODY : eTextKind = OBJ_OUTLINETEXT; break;
+ case TSS_TYPE_QUARTERBODY : eTextKind = OBJ_OUTLINETEXT; bAutoFit = true; break;
}
if ( aTextObj.GetDestinationInstance() != TSS_TYPE_TEXT_IN_SHAPE )
{
@@ -1177,6 +1178,15 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
}
pTObj->SetMergedItem( SvxFrameDirectionItem( bVerticalText ? FRMDIR_VERT_TOP_RIGHT : FRMDIR_HORI_LEFT_TOP, EE_PARA_WRITINGDIR ) );
+ if (bAutoFit)
+ {
+ // disable both, defeats purpose of autofit
+ // otherwise
+ bAutoGrowHeight = sal_False;
+ bAutoGrowWidth = sal_False;
+ pTObj->SetMergedItem( SdrTextFitToSizeTypeItem(SDRTEXTFIT_AUTOFIT) );
+ }
+
if ( !pTObj->ISA( SdrObjCustomShape ) )
{
pTObj->SetMergedItem( SdrTextAutoGrowWidthItem( bAutoGrowWidth ) );
More information about the ooo-build-commit
mailing list