Kaydet (Commit) 03c3cd90 authored tarafından Noel Grandin's avatar Noel Grandin

fix maybevoid attributes

..from commit d256dbed
"Convert chart2::Title service to new style"

Change-Id: Ib4b8a9126f1042c7d0b8cc07505444f25fe9c55a
üst d664f279
...@@ -386,18 +386,18 @@ double Title::getPropertyDouble(const OUString& aPropertyName) throw (css::uno:: ...@@ -386,18 +386,18 @@ double Title::getPropertyDouble(const OUString& aPropertyName) throw (css::uno::
return b; return b;
} }
awt::Size Title::getReferencePageSize() throw(css::uno::RuntimeException) beans::Optional<awt::Size> Title::getReferencePageSize() throw(css::uno::RuntimeException)
{ {
uno::Any any = getPropertyValue("ReferencePageSize"); uno::Any any = getPropertyValue("ReferencePageSize");
awt::Size b; beans::Optional<awt::Size> b;
any >>= b; any >>= b;
return b; return b;
} }
chart2::RelativePosition Title::getRelativePosition() throw(css::uno::RuntimeException) beans::Optional<chart2::RelativePosition> Title::getRelativePosition() throw(css::uno::RuntimeException)
{ {
uno::Any any = getPropertyValue("RelativePosition"); uno::Any any = getPropertyValue("RelativePosition");
chart2::RelativePosition b; beans::Optional<chart2::RelativePosition> b;
any >>= b; any >>= b;
return b; return b;
} }
......
...@@ -89,11 +89,11 @@ public: ...@@ -89,11 +89,11 @@ public:
{ return getPropertyBool("StackCharacters"); } { return getPropertyBool("StackCharacters"); }
virtual void SAL_CALL setStackCharacters(sal_Bool p1) throw(css::uno::RuntimeException) virtual void SAL_CALL setStackCharacters(sal_Bool p1) throw(css::uno::RuntimeException)
{ setPropertyBool("StackCharacters", p1); } { setPropertyBool("StackCharacters", p1); }
virtual com::sun::star::chart2::RelativePosition SAL_CALL getRelativePosition() throw(css::uno::RuntimeException); virtual css::beans::Optional<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) virtual void SAL_CALL setRelativePosition(const css::beans::Optional<css::chart2::RelativePosition>& p1) throw(css::uno::RuntimeException)
{ setPropertyValue("RelativePosition", css::uno::Any(p1)); } { setPropertyValue("RelativePosition", css::uno::Any(p1)); }
virtual com::sun::star::awt::Size SAL_CALL getReferencePageSize() throw(css::uno::RuntimeException); virtual css::beans::Optional<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) virtual void SAL_CALL setReferencePageSize(const css::beans::Optional<css::awt::Size>& p1) throw(css::uno::RuntimeException)
{ setPropertyValue("ReferencePageSize", css::uno::Any(p1)); } { setPropertyValue("ReferencePageSize", css::uno::Any(p1)); }
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include <com/sun/star/chart2/XTitle.idl> #include <com/sun/star/chart2/XTitle.idl>
#include <com/sun/star/chart2/RelativePosition.idl> #include <com/sun/star/chart2/RelativePosition.idl>
#include <com/sun/star/beans/XPropertySet.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/LineProperties.idl>
#include <com/sun/star/drawing/FillProperties.idl> #include <com/sun/star/drawing/FillProperties.idl>
//FIXME does not exist <com/sun/star/layout/LayoutElement.idl> //FIXME does not exist <com/sun/star/layout/LayoutElement.idl>
...@@ -67,7 +68,7 @@ interface XTitle2 ...@@ -67,7 +68,7 @@ interface XTitle2
<p>If a relative position is given the title is not automatically placed, <p>If a relative position is given the title is not automatically placed,
but instead is placed relative on the page.</p> but instead is placed relative on the page.</p>
*/ */
[attribute] ::com::sun::star::chart2::RelativePosition RelativePosition; [attribute] ::com::sun::star::beans::Optional<::com::sun::star::chart2::RelativePosition> RelativePosition;
/** contains the size of the page at the time when properties were /** contains the size of the page at the time when properties were
...@@ -76,7 +77,7 @@ interface XTitle2 ...@@ -76,7 +77,7 @@ interface XTitle2
<p>This way it is possible to resize objects (like text) in <p>This way it is possible to resize objects (like text) in
the view without modifying the model.</p> the view without modifying the model.</p>
*/ */
[attribute] com::sun::star::awt::Size ReferencePageSize; [attribute] ::com::sun::star::beans::Optional<com::sun::star::awt::Size> ReferencePageSize;
}; };
}; }; }; }; }; }; }; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment