[prev in list] [next in list] [prev in thread] [next in thread]
List: opensuse-commit
Subject: commit OpenOffice_org-base for openSUSE:Factory
From: root () Hilbert ! suse ! de (h_root)
Date: 2009-03-30 16:13:08
Message-ID: 20090330161309.3631B678161 () Hilbert ! suse ! de
[Download RAW message or body]
Hello community,
here is the log from the commit of package OpenOffice_org-base for openSUSE:Factory
checked in at Mon Mar 30 18:13:08 CEST 2009.
--------
--- OpenOffice_org-base/OpenOffice_org-base.changes 2009-03-20 16:10:32.000000000 \
+0100
+++ OpenOffice_org-base/OpenOffice_org-base.changes 2009-03-27 21:17:44.000000000 \
+0100 @@ -1,0 +2,6 @@
+Fri Mar 27 21:17:08 CET 2009 - pmladek@suse.cz
+
+- updated to the milestone ooo310-m7
+- updated ooo-build to version 3.0.99.3 (3.1-beta3)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
ooo310-m6-base.tar.bz2
New:
----
ooo310-m7-base.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ OpenOffice_org-base.spec ++++++
--- /var/tmp/diff_new_pack.U21638/_old 2009-03-30 18:11:35.000000000 +0200
+++ /var/tmp/diff_new_pack.U21638/_new 2009-03-30 18:11:35.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package OpenOffice_org-base (Version 3.0.99.2)
+# spec file for package OpenOffice_org-base (Version 3.0.99.3)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,9 +19,9 @@
Name: OpenOffice_org-base
-Version: 3.0.99.2
+Version: 3.0.99.3
Release: 1
-%define ooo_build_version 3.0.99.2
+%define ooo_build_version 3.0.99.3
%define piece base
#!BuildIgnore: OpenOffice_org
BuildRequires: ImageMagick ant ant-apache-regexp bison boost-devel ccache \
cups-devel curl-devel db-devel flac-devel flex gnome-vfs2-devel gperf gtk2-devel icu \
java-devel kdelibs3-devel krb5 libexif mono-devel neon-devel openldap2-devel \
pam-devel perl-Archive-Zip perl-Compress-Zlib python-devel recode unixODBC-devel \
unzip update-desktop-files xml-commons-apis xorg-x11 zip @@ -30,7 +30,7 @@
BuildRequires: OpenOffice_org-libs-core-devel = %version
%define ooo_prefix %_libdir
%define ooo_home ooo3
-%define ooo_build_tag ooo310-m6
+%define ooo_build_tag ooo310-m7
License: LGPL v3 only
Group: Productivity/Office/Suite
AutoReqProv: on
@@ -130,6 +130,9 @@
%ooo_prefix/%ooo_home/solver/noarch
%changelog
+* Fri Mar 27 2009 pmladek@suse.cz
+- updated to the milestone ooo310-m7
+- updated ooo-build to version 3.0.99.3 (3.1-beta3)
* Fri Mar 20 2009 pmladek@suse.cz
- updated to the milestone ooo310-m6
- updated ooo-build to version 3.0.99.2 (3.1-beta2)
++++++ ooo310-m6-base.tar.bz2 -> ooo310-m7-base.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore \
old/ooo310-m6-base/dbaccess/source/core/dataaccess/databasedocument.cxx \
new/ooo310-m7-base/dbaccess/source/core/dataaccess/databasedocument.cxx
--- old/ooo310-m6-base/dbaccess/source/core/dataaccess/databasedocument.cxx 2009-02-06 \
12:35:13.000000000 +0100
+++ new/ooo310-m7-base/dbaccess/source/core/dataaccess/databasedocument.cxx 2009-03-19 \
23:25:35.000000000 +0100 @@ -842,7 +842,7 @@
writeStorage( _rxTargetStorage, aWriteArgs );
// commit target storage
- OSL_VERIFY( m_pImpl->commitStorageIfWriteable_ignoreErrors( _rxTargetStorage \
) ); + OSL_VERIFY( m_pImpl->commitStorageIfWriteable( _rxTargetStorage ) );
}
catch( const IOException& ) { throw; }
catch( const RuntimeException& ) { throw; }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore \
old/ooo310-m6-base/dbaccess/source/ext/macromigration/migrationengine.cxx \
new/ooo310-m7-base/dbaccess/source/ext/macromigration/migrationengine.cxx
--- old/ooo310-m6-base/dbaccess/source/ext/macromigration/migrationengine.cxx 2009-02-05 \
12:38:04.000000000 +0100
+++ new/ooo310-m7-base/dbaccess/source/ext/macromigration/migrationengine.cxx 2009-03-19 \
23:25:35.000000000 +0100 @@ -1171,10 +1171,13 @@
// -----------------
// clean up
// store the sub document, including removal of the (now obsolete) "Scripts" \
sub folder
- bSuccess = bSuccess
- && ScriptsStorage::removeFromDocument( aSubDocument.xDocument, \
m_rLogger )
- && lcl_commitDocumentStorage_nothrow( aSubDocument.xDocument, \
m_rLogger )
- && lcl_storeEmbeddedDocument_nothrow( aSubDocument );
+ if ( m_rLogger.movedAnyLibrary( m_nCurrentDocumentID ) )
+ {
+ bSuccess = bSuccess
+ && ScriptsStorage::removeFromDocument( aSubDocument.xDocument, \
m_rLogger ) + && lcl_commitDocumentStorage_nothrow( \
aSubDocument.xDocument, m_rLogger ) + && \
lcl_storeEmbeddedDocument_nothrow( aSubDocument ); + }
// unload in any case, even if we were not successful
bSuccess = lcl_unloadSubDocument_nothrow( aSubDocument, m_rLogger )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore \
old/ooo310-m6-base/dbaccess/source/ext/macromigration/migrationlog.cxx \
new/ooo310-m7-base/dbaccess/source/ext/macromigration/migrationlog.cxx
--- old/ooo310-m6-base/dbaccess/source/ext/macromigration/migrationlog.cxx 2008-12-09 \
09:25:38.000000000 +0100
+++ new/ooo310-m7-base/dbaccess/source/ext/macromigration/migrationlog.cxx 2009-03-19 \
23:25:35.000000000 +0100 @@ -423,6 +423,18 @@
}
//--------------------------------------------------------------------
+ bool MigrationLog::movedAnyLibrary( const DocumentID _nDocID )
+ {
+ DocumentLogs::const_iterator docPos = m_pData->aDocumentLogs.find( _nDocID \
); + if ( docPos == m_pData->aDocumentLogs.end() )
+ {
+ OSL_ENSURE( false, "MigrationLog::movedAnyLibrary: document is not \
known!" ); + return false;
+ }
+ return !docPos->second.aMovedLibraries.empty();
+ }
+
+ //--------------------------------------------------------------------
::rtl::OUString MigrationLog::getCompleteLog() const
{
::rtl::OUStringBuffer aBuffer;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore \
old/ooo310-m6-base/dbaccess/source/ext/macromigration/migrationlog.hxx \
new/ooo310-m7-base/dbaccess/source/ext/macromigration/migrationlog.hxx
--- old/ooo310-m6-base/dbaccess/source/ext/macromigration/migrationlog.hxx 2008-10-16 \
09:57:26.000000000 +0200
+++ new/ooo310-m7-base/dbaccess/source/ext/macromigration/migrationlog.hxx 2009-03-19 \
23:25:35.000000000 +0100 @@ -110,6 +110,10 @@
const ::rtl::OUString& _rOriginalLibName
) const;
+ /** determines whether for the given document, any library needed to be (and \
was) moved + */
+ bool movedAnyLibrary( const DocumentID );
+
/** provides a human-readable version of the log, explaining a user what \
happened during the migration.
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore \
old/ooo310-m6-base/reportdesign/inc/ReportDefinition.hxx \
new/ooo310-m7-base/reportdesign/inc/ReportDefinition.hxx
--- old/ooo310-m6-base/reportdesign/inc/ReportDefinition.hxx 2008-08-19 \
11:59:34.000000000 +0200
+++ new/ooo310-m7-base/reportdesign/inc/ReportDefinition.hxx 2009-03-20 \
00:08:31.000000000 +0100 @@ -364,6 +364,8 @@
virtual ::com::sun::star::uno::Reference< \
::com::sun::star::task::XInteractionHandler > getInteractionHandler() const; virtual \
bool isEnableSetModified() const;
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > \
getContext() const; +
private:
/** loads the report definition from the given storage
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore \
old/ooo310-m6-base/reportdesign/inc/RptModel.hxx \
new/ooo310-m7-base/reportdesign/inc/RptModel.hxx
--- old/ooo310-m6-base/reportdesign/inc/RptModel.hxx 2008-04-10 19:04:12.000000000 \
+0200
+++ new/ooo310-m7-base/reportdesign/inc/RptModel.hxx 2009-03-20 00:08:31.000000000 \
+0100 @@ -96,6 +96,8 @@
/// returns the XReportDefinition which the OReportModel belongs to
::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >
getReportDefinition() const;
+
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > \
createShape(const ::rtl::OUString& \
aServiceSpecifier,::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape \
>& _rShape,sal_Int32 nOrientation = -1); };
}
#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore \
old/ooo310-m6-base/reportdesign/source/core/api/FixedText.cxx \
new/ooo310-m7-base/reportdesign/source/core/api/FixedText.cxx
--- old/ooo310-m6-base/reportdesign/source/core/api/FixedText.cxx 2008-08-19 \
12:06:17.000000000 +0200
+++ new/ooo310-m7-base/reportdesign/source/core/api/FixedText.cxx 2009-03-20 \
00:08:31.000000000 +0100 @@ -110,9 +110,6 @@
FixedTextPropertySet::dispose();
cppu::WeakComponentImplHelperBase::dispose();
uno::Reference< report::XFixedText> xHoldAlive = this;
- {
- m_aProps.dispose(m_refCount);
- }
}
// -----------------------------------------------------------------------------
::rtl::OUString OFixedText::getImplementationName_Static( ) \
throw(uno::RuntimeException)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore \
old/ooo310-m6-base/reportdesign/source/core/api/FormattedField.cxx \
new/ooo310-m7-base/reportdesign/source/core/api/FormattedField.cxx
--- old/ooo310-m6-base/reportdesign/source/core/api/FormattedField.cxx 2008-04-10 \
20:10:37.000000000 +0200
+++ new/ooo310-m7-base/reportdesign/source/core/api/FormattedField.cxx 2009-03-20 \
00:08:31.000000000 +0100 @@ -116,12 +116,8 @@
{
FormattedFieldPropertySet::dispose();
cppu::WeakComponentImplHelperBase::dispose();
- uno::Reference< report::XFormattedField> xHoldAlive = this;
- {
- m_xFormatsSupplier.clear();
- m_xFunction.clear();
- m_aProps.dispose(m_refCount);
- }
+ m_xFormatsSupplier.clear();
+ m_xFunction.clear();
}
// -----------------------------------------------------------------------------
::rtl::OUString OFormattedField::getImplementationName_Static( ) \
throw(uno::RuntimeException)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore \
old/ooo310-m6-base/reportdesign/source/core/api/ImageControl.cxx \
new/ooo310-m7-base/reportdesign/source/core/api/ImageControl.cxx
--- old/ooo310-m6-base/reportdesign/source/core/api/ImageControl.cxx 2008-06-16 \
15:28:32.000000000 +0200
+++ new/ooo310-m7-base/reportdesign/source/core/api/ImageControl.cxx 2009-03-20 \
00:08:31.000000000 +0100 @@ -182,10 +182,6 @@
{
ImageControlPropertySet::dispose();
cppu::WeakComponentImplHelperBase::dispose();
- uno::Reference< report::XImageControl> xHoldAlive = this;
- {
- m_aProps.dispose(m_refCount);
- }
}
// -----------------------------------------------------------------------------
::rtl::OUString OImageControl::getImplementationName_Static( ) \
throw(uno::RuntimeException)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore \
old/ooo310-m6-base/reportdesign/source/core/api/ReportComponent.cxx \
new/ooo310-m7-base/reportdesign/source/core/api/ReportComponent.cxx
--- old/ooo310-m6-base/reportdesign/source/core/api/ReportComponent.cxx 2008-06-16 \
15:28:50.000000000 +0200
+++ new/ooo310-m7-base/reportdesign/source/core/api/ReportComponent.cxx 2009-03-20 \
00:08:31.000000000 +0100 @@ -41,7 +41,7 @@
#include "ReportControlModel.hxx"
#include <com/sun/star/reflection/XProxyFactory.hpp>
#include <com/sun/star/text/ParagraphVertAlign.hpp>
-#include <svx/unoshape.hxx>
+// #include <svx/unoshape.hxx>
#include <svx/unolingu.hxx>
#include <svtools/syslocale.hxx>
#include <svtools/lingucfg.hxx>
@@ -122,10 +122,6 @@
{
osl_incrementInterlockedCount( &_rRefCount );
{
- // decrement the count from ReportDrawPage.cxx aArgs[0] <<= \
SvxDrawPage::_CreateShape( pObj );
- SvxShape* pShape = SvxShape::getImplementation( _xShape );
- if ( pShape )
- pShape->release();
m_xProxy.set(_xShape,uno::UNO_QUERY);
::comphelper::query_aggregation(m_xProxy,m_xShape);
::comphelper::query_aggregation(m_xProxy,m_xProperty);
@@ -138,21 +134,7 @@
if ( m_xProxy.is() )
m_xProxy->setDelegator( _xTunnel );
}
- // do not decrement the refcount again, this will be done from the any \
ReportDrawPage.cxx aArgs[0] <<= SvxDrawPage::_CreateShape( pObj ); , otherwise it \
will delete the object
- //osl_decrementInterlockedCount( &_rRefCount );
-}
-// -----------------------------------------------------------------------------
-void OReportComponentProperties::dispose(oslInterlockedCount& _rRefCount)
-{
- if ( m_xProxy.is() )
- osl_decrementInterlockedCount( &_rRefCount );
- //m_xShape.clear();
- //m_xTypeProvider.clear();
- //m_xUnoTunnel.clear();
- //m_xServiceInfo.clear();
- //m_xProperty.clear();
- m_xContext.clear();
- m_xFactory.clear();
+ osl_decrementInterlockedCount( &_rRefCount );
}
// -----------------------------------------------------------------------------
OReportComponentProperties::~OReportComponentProperties()
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore \
old/ooo310-m6-base/reportdesign/source/core/api/ReportControlModel.cxx \
new/ooo310-m7-base/reportdesign/source/core/api/ReportControlModel.cxx
--- old/ooo310-m6-base/reportdesign/source/core/api/ReportControlModel.cxx 2008-04-10 \
20:13:48.000000000 +0200
+++ new/ooo310-m7-base/reportdesign/source/core/api/ReportControlModel.cxx 2009-03-20 \
00:08:31.000000000 +0100 @@ -152,13 +152,12 @@
throw lang::IndexOutOfBoundsException();
}
// -----------------------------------------------------------------------------
-void OReportControlModel::dispose(oslInterlockedCount& _rRefCount)
+void OReportControlModel::dispose()
{
m_aFormatConditions.clear();
lang::EventObject aDisposeEvent( m_pOwner );
aContainerListeners.disposeAndClear( aDisposeEvent );
m_aFormatConditions.clear();
- aComponent.dispose(_rRefCount);
}
// -----------------------------------------------------------------------------
bool OReportControlModel::isInterfaceForbidden(const uno::Type& _rType)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore \
old/ooo310-m6-base/reportdesign/source/core/api/ReportDefinition.cxx \
new/ooo310-m7-base/reportdesign/source/core/api/ReportDefinition.cxx
--- old/ooo310-m6-base/reportdesign/source/core/api/ReportDefinition.cxx 2008-12-01 \
14:31:27.000000000 +0100
+++ new/ooo310-m7-base/reportdesign/source/core/api/ReportDefinition.cxx 2009-03-20 \
00:08:31.000000000 +0100 @@ -705,7 +705,6 @@
{
ReportDefinitionPropertySet::dispose();
cppu::WeakComponentImplHelperBase::dispose();
- m_aProps->dispose(m_refCount);
}
// -----------------------------------------------------------------------------
void SAL_CALL OReportDefinition::disposing()
@@ -2069,68 +2068,19 @@
::osl::MutexGuard aGuard(m_aMutex);
::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
-
- uno::Reference< drawing::XShape > xShape;
- uno::Reference< embed::XStorage > xStorage;
- sal_Int32 nOrientation = 1;
- const uno::Any* pIter = _aArgs.getConstArray();
- const uno::Any* pEnd = pIter + _aArgs.getLength();
- for(;pIter != pEnd ;++pIter)
- {
- beans::NamedValue aValue;
- *pIter >>= aValue;
- if ( aValue.Name == PROPERTY_SHAPE )
- xShape.set(aValue.Value,uno::UNO_QUERY);
- else if ( aValue.Name == PROPERTY_ORIENTATION )
- aValue.Value >>= nOrientation;
- else if( aValue.Name.equalsAscii( "Storage" ) )
- aValue.Value >>= xStorage;
- }
-
uno::Reference< uno::XInterface > xRet;
- if ( xShape.is() )
+ if ( aServiceSpecifier.indexOf( \
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ImportEmbeddedObjectResolver"))) \
== 0 ) {
- if ( aServiceSpecifier == SERVICE_FORMATTEDFIELD )
- {
- uno::Reference<report::XFormattedField> xProp = new \
OFormattedField(m_aProps->m_xContext,this,xShape);
- xRet = xProp;
- if ( xShape.is() )
- throw uno::Exception();
- xProp->setPropertyValue( PROPERTY_FORMATSSUPPLIER, \
uno::makeAny(uno::Reference< util::XNumberFormatsSupplier \
>(*this,uno::UNO_QUERY)) );
- }
- else if ( aServiceSpecifier == SERVICE_FIXEDTEXT)
- {
- xRet = static_cast<cppu::OWeakObject*>(new \
OFixedText(m_aProps->m_xContext,this,xShape));
- if ( xShape.is() )
- throw uno::Exception();
- }
- else if ( aServiceSpecifier == SERVICE_FIXEDLINE)
- {
- xRet = static_cast<cppu::OWeakObject*>(new \
OFixedLine(m_aProps->m_xContext,this,xShape,nOrientation));
- if ( xShape.is() )
- throw uno::Exception();
- }
- else if ( aServiceSpecifier == SERVICE_IMAGECONTROL )
- {
- xRet = static_cast<cppu::OWeakObject*>(new \
OImageControl(m_aProps->m_xContext,this,xShape));
- if ( xShape.is() )
- throw uno::Exception();
- }
- else if ( aServiceSpecifier == SERVICE_REPORTDEFINITION )
- {
- xRet = static_cast<cppu::OWeakObject*>(new \
OReportDefinition(m_aProps->m_xContext,this,xShape));
- if ( xShape.is() )
- throw uno::Exception();
- }
- else if ( xShape.is() )
+ uno::Reference< embed::XStorage > xStorage;
+ const uno::Any* pIter = _aArgs.getConstArray();
+ const uno::Any* pEnd = pIter + _aArgs.getLength();
+ for(;pIter != pEnd ;++pIter)
{
- xRet = static_cast<cppu::OWeakObject*>(new \
OShape(m_aProps->m_xContext,this,xShape,aServiceSpecifier));
- if ( xShape.is() )
- throw uno::Exception();
- }
- }
- else if ( aServiceSpecifier.indexOf( \
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ImportEmbeddedObjectResolver"))) \
== 0 )
- {
+ beans::NamedValue aValue;
+ *pIter >>= aValue;
+ if( aValue.Name.equalsAscii( "Storage" ) )
+ aValue.Value >>= xStorage;
+ } // for(;pIter != pEnd ;++pIter)
m_pImpl->m_pObjectContainer->SwitchPersistence(xStorage);
xRet = static_cast< ::cppu::OWeakObject* \
>(SvXMLEmbeddedObjectHelper::Create( xStorage,*this, EMBEDDEDOBJECTHELPER_MODE_READ \
> ));
}
@@ -2256,19 +2206,7 @@
else
xShape.set(SvxUnoDrawMSFactory::createInstance( aServiceSpecifier \
),uno::UNO_QUERY_THROW);
-
- uno::Reference< uno::XInterface > xReturn;
- {
- uno::Sequence< uno::Any > aArgs(1);
- {
- beans::NamedValue aValue;
- aValue.Name = PROPERTY_SHAPE;
- aValue.Value <<= xShape; xShape.clear(); // keep exactly *one* \
reference!
- aArgs[0] <<= aValue;
- }
- xReturn = createInstanceWithArguments(aServiceSpecifier,aArgs);
- }
- return xReturn;
+ return m_pImpl->m_pReportModel->createShape(aServiceSpecifier,xShape);
}
//-----------------------------------------------------------------------------
uno::Sequence< ::rtl::OUString > SAL_CALL \
OReportDefinition::getAvailableServiceNames(void) throw( uno::RuntimeException ) @@ \
-2770,6 +2708,11 @@ }
return m_pImpl->m_xDocumentProperties;
}
+// -----------------------------------------------------------------------------
+uno::Reference< uno::XComponentContext > OReportDefinition::getContext() const
+{
+ return m_aProps->m_xContext;
+}
// =============================================================================
}// namespace reportdesign
// =============================================================================
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore \
old/ooo310-m6-base/reportdesign/source/core/api/Shape.cxx \
new/ooo310-m7-base/reportdesign/source/core/api/Shape.cxx
--- old/ooo310-m6-base/reportdesign/source/core/api/Shape.cxx 2008-06-16 \
15:30:10.000000000 +0200
+++ new/ooo310-m7-base/reportdesign/source/core/api/Shape.cxx 2009-03-20 \
00:08:31.000000000 +0100 @@ -126,10 +126,6 @@
{
ShapePropertySet::dispose();
cppu::WeakComponentImplHelperBase::dispose();
- uno::Reference< report::XShape> xHoldAlive = this;
- {
- m_aProps.dispose(m_refCount);
- }
}
// -----------------------------------------------------------------------------
::rtl::OUString OShape::getImplementationName_Static( ) \
throw(uno::RuntimeException)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore \
old/ooo310-m6-base/reportdesign/source/core/inc/ReportComponent.hxx \
new/ooo310-m7-base/reportdesign/source/core/inc/ReportComponent.hxx
--- old/ooo310-m6-base/reportdesign/source/core/inc/ReportComponent.hxx 2008-04-10 \
20:19:18.000000000 +0200
+++ new/ooo310-m7-base/reportdesign/source/core/inc/ReportComponent.hxx 2009-03-20 \
00:08:31.000000000 +0100 @@ -85,8 +85,6 @@
void setShape(::com::sun::star::uno::Reference< \
::com::sun::star::drawing::XShape >& _xShape
,const ::com::sun::star::uno::Reference< \
::com::sun::star::report::XReportComponent>& _xTunnel ,oslInterlockedCount& \
_rRefCount);
-
- void dispose(oslInterlockedCount& _rRefCount);
};
}
#endif // RPT_REPORTCOMPONENT_HXX
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore \
old/ooo310-m6-base/reportdesign/source/core/inc/ReportControlModel.hxx \
new/ooo310-m7-base/reportdesign/source/core/inc/ReportControlModel.hxx
--- old/ooo310-m6-base/reportdesign/source/core/inc/ReportControlModel.hxx 2008-06-16 \
15:30:54.000000000 +0200
+++ new/ooo310-m7-base/reportdesign/source/core/inc/ReportControlModel.hxx 2009-03-20 \
00:08:31.000000000 +0100 @@ -115,7 +115,7 @@
,bPrintWhenGroupChange(sal_False)
{}
- void dispose(oslInterlockedCount& _rRefCount);
+ void dispose();
// XContainer
void addContainerListener( const ::com::sun::star::uno::Reference< \
::com::sun::star::container::XContainerListener >& xListener ) throw \
(::com::sun::star::uno::RuntimeException);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore \
old/ooo310-m6-base/reportdesign/source/core/sdr/ReportDrawPage.cxx \
new/ooo310-m7-base/reportdesign/source/core/sdr/ReportDrawPage.cxx
--- old/ooo310-m6-base/reportdesign/source/core/sdr/ReportDrawPage.cxx 2008-08-19 \
12:07:56.000000000 +0200
+++ new/ooo310-m7-base/reportdesign/source/core/sdr/ReportDrawPage.cxx 2009-03-20 \
00:08:31.000000000 +0100 @@ -30,6 +30,7 @@
#include "ReportDrawPage.hxx"
#include "RptObject.hxx"
+#include "RptModel.hxx"
#include "RptDef.hxx"
#include "corestrings.hrc"
#include <comphelper/mimeconfighelper.hxx>
@@ -143,20 +144,8 @@
try
{
- uno::Sequence< uno::Any > aArgs(bChangeOrientation ? 2 : 1);
- {
- beans::NamedValue aValue;
- aValue.Name = PROPERTY_SHAPE;
- aValue.Value <<= xShape; xShape.clear(); // keep exactly *one* \
reference!
- aArgs[0] <<= aValue;
- if ( bChangeOrientation )
- {
- aValue.Name = PROPERTY_ORIENTATION;
- aValue.Value <<= sal_Int32(0);
- aArgs[1] <<= aValue;
- }
- }
- xRet.set( xFactory->createInstanceWithArguments( sServiceName, aArgs ), \
uno::UNO_QUERY_THROW ); + OReportModel* pRptModel = \
static_cast<OReportModel*>(pObj->GetModel()); + xRet.set( \
pRptModel->createShape(sServiceName,xShape,bChangeOrientation ? 0 : -1), \
uno::UNO_QUERY_THROW ); }
catch( const uno::Exception& )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore \
old/ooo310-m6-base/reportdesign/source/core/sdr/RptModel.cxx \
new/ooo310-m7-base/reportdesign/source/core/sdr/RptModel.cxx
--- old/ooo310-m6-base/reportdesign/source/core/sdr/RptModel.cxx 2008-08-19 \
12:08:10.000000000 +0200
+++ new/ooo310-m7-base/reportdesign/source/core/sdr/RptModel.cxx 2009-03-20 \
00:08:31.000000000 +0100 @@ -48,10 +48,15 @@
#include "rptui_slotid.hrc"
#include "RptDef.hxx"
#include "corestrings.hrc"
+#include "FixedLine.hxx"
+#include "FormattedField.hxx"
+#include "FixedText.hxx"
+#include "ImageControl.hxx"
+#include "Shape.hxx"
namespace rptui
{
-
+using namespace reportdesign;
using namespace com::sun::star;
DBG_NAME( rpt_OReportModel )
TYPEINIT1(OReportModel,SdrModel);
@@ -179,6 +184,53 @@
{
return uno::Reference< uno::XInterface >(getReportDefinition(),uno::UNO_QUERY);
}
+// -----------------------------------------------------------------------------
+uno::Reference< uno::XInterface > OReportModel::createShape(const ::rtl::OUString& \
aServiceSpecifier,uno::Reference< drawing::XShape >& _rShape,sal_Int32 nOrientation) \
+{ + uno::Reference< uno::XInterface > xRet;
+ if ( _rShape.is() )
+ {
+ if ( aServiceSpecifier == SERVICE_FORMATTEDFIELD )
+ {
+ uno::Reference<report::XFormattedField> xProp = new \
OFormattedField(m_pReportDefinition->getContext(),m_pReportDefinition,_rShape); + \
xRet = xProp; + if ( _rShape.is() )
+ throw uno::Exception();
+ xProp->setPropertyValue( PROPERTY_FORMATSSUPPLIER, \
uno::makeAny(uno::Reference< util::XNumberFormatsSupplier \
>(*m_pReportDefinition,uno::UNO_QUERY)) ); + }
+ else if ( aServiceSpecifier == SERVICE_FIXEDTEXT)
+ {
+ xRet = static_cast<cppu::OWeakObject*>(new \
OFixedText(m_pReportDefinition->getContext(),m_pReportDefinition,_rShape)); + \
if ( _rShape.is() ) + throw uno::Exception();
+ }
+ else if ( aServiceSpecifier == SERVICE_FIXEDLINE)
+ {
+ xRet = static_cast<cppu::OWeakObject*>(new \
OFixedLine(m_pReportDefinition->getContext(),m_pReportDefinition,_rShape,nOrientation));
+ if ( _rShape.is() )
+ throw uno::Exception();
+ }
+ else if ( aServiceSpecifier == SERVICE_IMAGECONTROL )
+ {
+ xRet = static_cast<cppu::OWeakObject*>(new \
OImageControl(m_pReportDefinition->getContext(),m_pReportDefinition,_rShape)); + \
if ( _rShape.is() ) + throw uno::Exception();
+ }
+ else if ( aServiceSpecifier == SERVICE_REPORTDEFINITION )
+ {
+ xRet = static_cast<cppu::OWeakObject*>(new \
OReportDefinition(m_pReportDefinition->getContext(),m_pReportDefinition,_rShape)); + \
if ( _rShape.is() ) + throw uno::Exception();
+ }
+ else if ( _rShape.is() )
+ {
+ xRet = static_cast<cppu::OWeakObject*>(new \
OShape(m_pReportDefinition->getContext(),m_pReportDefinition,_rShape,aServiceSpecifier));
+ if ( _rShape.is() )
+ throw uno::Exception();
+ }
+ }
+ return xRet;
+}
//==================================================================
} //rptui
//==================================================================
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore \
old/ooo310-m6-base/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx \
new/ooo310-m7-base/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
--- old/ooo310-m6-base/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx 2009-02-18 \
15:36:54.000000000 +0100
+++ new/ooo310-m7-base/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx 2009-03-19 \
23:25:35.000000000 +0100 @@ -301,7 +301,7 @@
throw uno::Exception();
m_xDatabaseDataProvider.set(m_xModel->getDataProvider(),uno::UNO_QUERY);
- if ( !m_xDatabaseDataProvider.is() )
+ if ( !m_xDatabaseDataProvider.is() || \
!m_xDatabaseDataProvider->getActiveConnection().is() ) throw uno::Exception();
uno::Reference< reflection::XProxyFactory > xProxyFactory( \
m_xContext->getServiceManager()->createInstanceWithContext(
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic