[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.3-2-152-g08b6cbd
The following commit has been merged in the debian-experimental-4.1 branch:
commit 08b6cbdfcb331c4704c220ba0de5b2ee175ea743
Author: Rene Engelhard <rene@debian.org>
Date: Thu May 23 12:28:02 2013 +0200
make revert-d256dbede60533369d1aac64cca34721183f6a8a.diff apply...
diff --git a/patches/revert-d256dbede60533369d1aac64cca34721183f6a8a.diff b/patches/revert-d256dbede60533369d1aac64cca34721183f6a8a.diff
index 2ff8b4a..5a2f5d6 100644
--- a/patches/revert-d256dbede60533369d1aac64cca34721183f6a8a.diff
+++ b/patches/revert-d256dbede60533369d1aac64cca34721183f6a8a.diff
@@ -389,7 +389,7 @@ diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title
index 70db368..346a967 100644
--- a/chart2/source/model/main/Title.cxx
+++ b/chart2/source/model/main/Title.cxx
-@@ -370,40 +370,6 @@ void Title::fireModifyEvent()
+@@ -370,41 +370,6 @@
m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this )));
}
@@ -409,27 +409,28 @@ index 70db368..346a967 100644
- return b;
-}
-
--beans::Optional<awt::Size> Title::getReferencePageSize() throw(css::uno::RuntimeException)
+-awt::Size Title::getReferencePageSize() throw(css::uno::RuntimeException)
-{
- uno::Any any = getPropertyValue("ReferencePageSize");
-- beans::Optional<awt::Size> b;
+- awt::Size b;
- any >>= b;
- return b;
-}
-
--beans::Optional<chart2::RelativePosition> Title::getRelativePosition() throw(css::uno::RuntimeException)
+-chart2::RelativePosition Title::getRelativePosition() throw(css::uno::RuntimeException)
-{
- uno::Any any = getPropertyValue("RelativePosition");
-- beans::Optional<chart2::RelativePosition> b;
+- chart2::RelativePosition b;
- any >>= b;
- return b;
-}
-
-
-
-
+-
// ================================================================================
+ uno::Sequence< OUString > Title::getSupportedServiceNames_Static()
diff --git a/chart2/source/model/main/Title.hxx b/chart2/source/model/main/Title.hxx
index 62a2e0cd..c177d6e 100644
--- a/chart2/source/model/main/Title.hxx
@@ -443,7 +444,7 @@ index 62a2e0cd..c177d6e 100644
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/util/XCloneable.hpp>
-@@ -36,7 +36,7 @@ namespace chart
+@@ -36,7 +36,7 @@
namespace impl
{
typedef ::cppu::WeakImplHelper5<
@@ -452,15 +453,10 @@ index 62a2e0cd..c177d6e 100644
::com::sun::star::lang::XServiceInfo,
::com::sun::star::util::XCloneable,
::com::sun::star::util::XModifyBroadcaster,
-@@ -61,41 +61,9 @@ public:
- APPHELPER_XSERVICEINFO_DECL()
-
- /// merge XInterface implementations
-- DECLARE_XINTERFACE()
-+ DECLARE_XINTERFACE()
+@@ -65,38 +65,6 @@
/// merge XTypeProvider implementations
-- DECLARE_XTYPEPROVIDER()
--
+ DECLARE_XTYPEPROVIDER()
+
-
- // ambiguous overloads
- virtual void SAL_CALL setPropertyValue(const rtl::OUString& p1, const com::sun::star::uno::Any& p2) throw(css::uno::RuntimeException)
@@ -485,18 +481,18 @@ index 62a2e0cd..c177d6e 100644
- { return getPropertyBool("StackCharacters"); }
- virtual void SAL_CALL setStackCharacters(sal_Bool p1) throw(css::uno::RuntimeException)
- { setPropertyBool("StackCharacters", p1); }
-- virtual css::beans::Optional<com::sun::star::chart2::RelativePosition> SAL_CALL getRelativePosition() throw(css::uno::RuntimeException);
-- virtual void SAL_CALL setRelativePosition(const css::beans::Optional<css::chart2::RelativePosition>& p1) throw(css::uno::RuntimeException)
+- virtual com::sun::star::chart2::RelativePosition SAL_CALL getRelativePosition() throw(css::uno::RuntimeException);
+- virtual void SAL_CALL setRelativePosition(const com::sun::star::chart2::RelativePosition& p1) throw(css::uno::RuntimeException)
- { setPropertyValue("RelativePosition", css::uno::Any(p1)); }
-- virtual css::beans::Optional<com::sun::star::awt::Size> SAL_CALL getReferencePageSize() throw(css::uno::RuntimeException);
-- virtual void SAL_CALL setReferencePageSize(const css::beans::Optional<css::awt::Size>& p1) throw(css::uno::RuntimeException)
+- virtual com::sun::star::awt::Size SAL_CALL getReferencePageSize() throw(css::uno::RuntimeException);
+- virtual void SAL_CALL setReferencePageSize(const com::sun::star::awt::Size& p1) throw(css::uno::RuntimeException)
- { setPropertyValue("ReferencePageSize", css::uno::Any(p1)); }
-
-+ DECLARE_XTYPEPROVIDER()
-
+-
protected:
explicit Title( const Title & rOther );
-@@ -151,14 +119,6 @@ protected:
+
+@@ -151,14 +119,6 @@
void fireModifyEvent();
private:
@@ -875,7 +871,7 @@ deleted file mode 100644
index 64019d2..0000000
--- a/offapi/com/sun/star/chart2/XTitle2.idl
+++ b/dev/null
-@@ -1,87 +0,0 @@
+@@ -1,86 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
@@ -901,7 +897,6 @@ index 64019d2..0000000
-#include <com/sun/star/chart2/XTitle.idl>
-#include <com/sun/star/chart2/RelativePosition.idl>
-#include <com/sun/star/beans/XPropertySet.idl>
--#include <com/sun/star/beans/Optional.idl>
-#include <com/sun/star/drawing/LineProperties.idl>
-#include <com/sun/star/drawing/FillProperties.idl>
-//FIXME does not exist <com/sun/star/layout/LayoutElement.idl>
@@ -946,7 +941,7 @@ index 64019d2..0000000
- <p>If a relative position is given the title is not automatically placed,
- but instead is placed relative on the page.</p>
- */
-- [attribute] ::com::sun::star::beans::Optional<::com::sun::star::chart2::RelativePosition> RelativePosition;
+- [attribute] ::com::sun::star::chart2::RelativePosition RelativePosition;
-
-
- /** contains the size of the page at the time when properties were
@@ -955,7 +950,7 @@ index 64019d2..0000000
- <p>This way it is possible to resize objects (like text) in
- the view without modifying the model.</p>
- */
-- [attribute] ::com::sun::star::beans::Optional<com::sun::star::awt::Size> ReferencePageSize;
+- [attribute] com::sun::star::awt::Size ReferencePageSize;
-};
-
-}; }; }; };
--
LibreOffice packaging repository
Reply to: