[ooo-build-commit] .: patches/dev300
Katarina Machalkova
bubli at kemper.freedesktop.org
Wed Jun 30 09:00:34 PDT 2010
patches/dev300/xlsx-shared-xlsx-snapshot.diff | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 50b0f07c893807a4c815ea80b4fe1ab4288bf176
Author: Katarina Machalkova <kmachalkova at suse.cz>
Date: Wed Jun 30 17:57:18 2010 +0200
Adjusted to m83, round 3
now it actually builds
* patches/dev300/xlsx-shared-xlsx-snapshot.diff:
diff --git a/patches/dev300/xlsx-shared-xlsx-snapshot.diff b/patches/dev300/xlsx-shared-xlsx-snapshot.diff
index c23a926..a173b51 100644
--- a/patches/dev300/xlsx-shared-xlsx-snapshot.diff
+++ b/patches/dev300/xlsx-shared-xlsx-snapshot.diff
@@ -331,15 +331,15 @@
rComments->endElement( XML_text );
rComments->endElement( XML_comment );
}
-#@@ -990,7 +1008,7 @@ XclMacroHelper::SetMacroLink( const Stri
-# }
-#
-# XclExpShapeObj::XclExpShapeObj( const XclExpRoot& rRoot, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ) :
-#- XclObjAny( rRoot ),
-#+ XclObjAny( rRoot, xShape ),
-# XclMacroHelper( rRoot )
-# {
-# if( SdrObject* pSdrObj = ::GetSdrObjectFromXShape( xShape ) )
+@@ -990,7 +1008,7 @@ XclMacroHelper::SetMacroLink( const Stri
+ }
+
+ XclExpShapeObj::XclExpShapeObj( XclExpObjectManager& rRoot, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ) :
+- XclObjAny( rRoot ),
++ XclObjAny( rRoot, xShape ),
+ XclMacroHelper( rRoot )
+ {
+ if( SdrObject* pSdrObj = ::GetSdrObjectFromXShape( xShape ) )
@@ -1022,7 +1040,7 @@ struct OUStringLess : public std::binary
{
bool operator()(const OUString& x, const OUString& y) const
More information about the ooo-build-commit
mailing list