INTEGRATION: CWS os30 (1.13.56); FILE MERGED

2004/05/19 14:59:00 os 1.13.56.2: RESYNC: (1.13-1.14); FILE MERGED
2004/03/09 08:59:54 tl 1.13.56.1: #i26038# PageStyle vs PageProperties fixed

1 files changed, 31 insertions, 16 deletions

diff --git a/offapi/com/sun/star/style/PageProperties.idl b/offapi/com/sun/star/style/PageProperties.idl
index 1932ecad9..d90138612 100644
--- a/offapi/com/sun/star/style/PageProperties.idl
+++ b/offapi/com/sun/star/style/PageProperties.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: PageProperties.idl,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: obo $ $Date: 2004-06-03 23:24:37 $
+ *  last change: $Author: rt $ $Date: 2004-06-17 16:00:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -112,7 +112,7 @@
 published service PageProperties
 {
 //-----------------------------------------------------------------------------
-/** contains color of the background.
+/** contains the background color of the page.
  */
 [property] com::sun::star::util::Color BackColor;
 //-----------------------------------------------------------------------------
@@ -133,6 +133,9 @@ published service PageProperties
 [property] com::sun::star::style::GraphicLocation BackGraphicLocation;
 //-----------------------------------------------------------------------------
 /** determins if the background color is transparent.
+ 
+    <p>If this property is set to <TRUE/>,
+    <member>PageStyle::BackColor</member> will not be used.</p>
  */
 [property] boolean BackTransparent;
 //-----------------------------------------------------------------------------
@@ -152,19 +155,19 @@ published service PageProperties
  */
 [property] long BottomMargin;
 //-----------------------------------------------------------------------------
-/** determins the left border of the page.
+/** determines the style of the left border line of the page.
  */
 [property] com::sun::star::table::BorderLine LeftBorder;
 //-----------------------------------------------------------------------------
-/** determins the right border of the page.
+/** determines the style of the right border line of the page.
  */
 [property] com::sun::star::table::BorderLine RightBorder;
 //-----------------------------------------------------------------------------
-/** determins the top border of the page.
+/** determines the style of the top border line of the page.
  */
 [property] com::sun::star::table::BorderLine TopBorder;
 //-----------------------------------------------------------------------------
-/** determins the bottom border of the page.
+/** determines the style of the bottom border line of the page.
  */
 [property] com::sun::star::table::BorderLine BottomBorder;
 //-----------------------------------------------------------------------------
@@ -266,22 +269,25 @@ published service PageProperties
 [property] long HeaderRightMargin;
 //-----------------------------------------------------------------------------
 /** determines if the the background color of the header is transparent.
+
+    <p>If this property is set to <TRUE/>,
+    <member>PageStyle::HeaderBackColor</member> will not be used.</p>
  */
 [property] boolean HeaderBackTransparent;
 //-----------------------------------------------------------------------------
-/** determines the left border of the header.
+/** determines the style of the left border line of the header.
  */
 [property] com::sun::star::table::BorderLine HeaderLeftBorder;
 //-----------------------------------------------------------------------------
-/** determines the right border of the header.
+/** determines the style of the right border line of the header.
  */
 [property] com::sun::star::table::BorderLine HeaderRightBorder;
 //-----------------------------------------------------------------------------
-/** determines the top border of the header.
+/** determines the style of the top border line of the header.
  */
 [property] com::sun::star::table::BorderLine HeaderTopBorder;
 //-----------------------------------------------------------------------------
-/** determines the bottom border of the header.
+/** determines the style of the bottom border line of the header.
  */
 [property] com::sun::star::table::BorderLine HeaderBottomBorder;
 
@@ -368,23 +374,23 @@ published service PageProperties
  */
 [property] long FooterRightMargin;
 //-----------------------------------------------------------------------------
-/** determines if the background is transparent.
+/** determines if the background of the footer is transparent.
  */
 [property] boolean FooterBackTransparent;
 //-----------------------------------------------------------------------------
-/** contains the left border of the footer.
+/** contains the style of the left border line of the footer.
  */
 [property] com::sun::star::table::BorderLine FooterLeftBorder;
 //-----------------------------------------------------------------------------
-/** contains the right border of the footer.
+/** contains the style of the right border line of the footer.
  */
 [property] com::sun::star::table::BorderLine FooterRightBorder;
 //-----------------------------------------------------------------------------
-/** contains the top border of the footer.
+/** contains the style of the top border line of the footer.
  */
 [property] com::sun::star::table::BorderLine FooterTopBorder;
 //-----------------------------------------------------------------------------
-/** contains the bottom border of the footer.
+/** contains the style of the bottom border line of the footer.
  */
 [property] com::sun::star::table::BorderLine FooterBottomBorder;
 //-----------------------------------------------------------------------------
@@ -511,6 +517,15 @@ of the current page is used as limit.
 //-----------------------------------------------------------------------------
 /** determines whether to use dynamic spacing in footer or not. */
 [optional, property] boolean FooterDynamicSpacing;
+//-----------------------------------------------------------------------------
+/** determines the distance of all borders of the page. */
+[property] long BorderDistance;
+//-----------------------------------------------------------------------------
+/** contains the distance of all borders of the footer. */
+[property] long FooterBorderDistance;
+//-----------------------------------------------------------------------------
+/** determines the distance of all borders of the header. */
+[property] long HeaderBorderDistance;
 
 };
 //=============================================================================