INTEGRATION: CWS os30 (1.2.356); FILE MERGED

2004/06/17 14:45:03 os 1.2.356.2: RESYNC: (1.2-1.4); FILE MERGED
2004/03/09 08:59:55 tl 1.2.356.1: #i26038# PageStyle vs PageProperties fixed

1 files changed, 7 insertions, 462 deletions

diff --git a/offapi/com/sun/star/style/PageStyle.idl b/offapi/com/sun/star/style/PageStyle.idl
index cf90989bdf44..f345b5032627 100644
--- a/offapi/com/sun/star/style/PageStyle.idl
+++ b/offapi/com/sun/star/style/PageStyle.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: PageStyle.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: obo $ $Date: 2004-06-03 23:24:52 $
+ *  last change: $Author: rt $ $Date: 2004-06-17 16:00:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -66,33 +66,10 @@
 #include <com/sun/star/style/Style.idl>
 #endif
 
-#ifndef __com_sun_star_util_Color_idl__
-#include <com/sun/star/util/Color.idl>
+#ifndef __com_sun_star_style_PageProperties_idl__
+#include <com/sun/star/style/PageProperties.idl>
 #endif
 
-#ifndef __com_sun_star_table_ShadowFormat_idl__
-#include <com/sun/star/table/ShadowFormat.idl>
-#endif
-
-#ifndef __com_sun_star_table_BorderLine_idl__
-#include <com/sun/star/table/BorderLine.idl>
-#endif
-
-#ifndef __com_sun_star_style_PageStyleLayout_idl__
-#include <com/sun/star/style/PageStyleLayout.idl>
-#endif
-
-#ifndef __com_sun_star_style_GraphicLocation_idl__
-#include <com/sun/star/style/GraphicLocation.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Size_idl__
-#include <com/sun/star/awt/Size.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
-#include <com/sun/star/container/XNameContainer.idl>
-#endif
 
 //=============================================================================
 
@@ -112,443 +89,11 @@ published service PageStyle
     /** provides common functionality for styles.
      */
     service com::sun::star::style::Style;
+        //-------------------------------------------------------------------------
 
-    //=========================================================================
-
-    /** contains the background color of the page.
-      */
-    [property] com::sun::star::util::Color BackColor;
-
-    //-------------------------------------------------------------------------
-
-    /** determines whether 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;
-
-    //-------------------------------------------------------------------------
-
-    /** contains the URL of the background graphic.
-      */
-    [property] string BackGraphicURL;
-
-    //-------------------------------------------------------------------------
-
-    /** contains the filter name of the background graphic.
-      */
-    [property] string BackGraphicFilter;
-
-    //-------------------------------------------------------------------------
-
-    /** determines the location of the background graphic.
-      */
-    [property] com::sun::star::style::GraphicLocation BackGraphicLocation;
-
-    //-------------------------------------------------------------------------
-
-    /** determines the left margin of the page (in 1/100 mm).
-      */
-    [property] long LeftMargin;
-
-    //-------------------------------------------------------------------------
-
-    /** determines the right margin of the page (in 1/100 mm).
-      */
-    [property] long RightMargin;
-
-    //-------------------------------------------------------------------------
-
-    /** determines the top margin of the page (in 1/100 mm).
-      */
-    [property] long TopMargin;
-
-    //-------------------------------------------------------------------------
-
-    /** determines the bottom margin of the page (in 1/100 mm).
-      */
-    [property] long BottomMargin;
-
-    //-------------------------------------------------------------------------
-
-    /** determines the style of the left border line of the page.
-      */
-    [property] com::sun::star::table::BorderLine LeftBorder;
-
-    //-------------------------------------------------------------------------
-
-    /** determines the style of the right border line of the page.
-      */
-    [property] com::sun::star::table::BorderLine RightBorder;
-
-    //-------------------------------------------------------------------------
-
-    /** determines the style of the top border line of the page.
-      */
-    [property] com::sun::star::table::BorderLine TopBorder;
-
-    //-------------------------------------------------------------------------
-
-    /** determines the style of the bottom border line of the page.
-      */
-    [property] com::sun::star::table::BorderLine BottomBorder;
-
-    //-------------------------------------------------------------------------
-
-    /** determines the left border distance of the page (in 1/100 mm).
-      */
-    [property] long LeftBorderDistance;
-
-    //-------------------------------------------------------------------------
-
-    /** determines the right border distance of the page (in 1/100 mm).
-      */
-    [property] long RightBorderDistance;
-
-    //-------------------------------------------------------------------------
-
-    /** determines the top border distance of the page (in 1/100 mm).
-      */
-    [property] long TopBorderDistance;
-
-    //-------------------------------------------------------------------------
-
-    /** determines the bottom border distance of the page (in 1/100 mm).
-      */
-    [property] long BottomBorderDistance;
-
-    //-------------------------------------------------------------------------
-
-    /** determines the distance of all borders of the page (in 1/100 mm).
-      */
-    [property] long BorderDistance;
-
-    //-------------------------------------------------------------------------
-
-    /** determines the shadow of the page.
-      */
-    [property] com::sun::star::table::ShadowFormat ShadowFormat;
-
-    //-------------------------------------------------------------------------
-
-    /** determines if the page format is landscape.
-      */
-    [property] boolean IsLandscape;
-
-    //-------------------------------------------------------------------------
-
-    /** determines the default numbering type for this page.
-      */
-    [property] short NumberingType;
-
-    //-------------------------------------------------------------------------
-
-    /** determines the layout of the page.
-      */
-    [property] com::sun::star::style::PageStyleLayout PageStyleLayout;
-
-    //-------------------------------------------------------------------------
-
-    /** contains the name of a paper tray of the selected printer.
-      */
-    [property] string PrinterPaperTray;
-
-    //-------------------------------------------------------------------------
-
-    /** contains the paper size of the page.
-      */
-    [property] com::sun::star::awt::Size Size;
-
-    //-------------------------------------------------------------------------
-
-    /** contains the width of the page (in 1/100 mm).
-      */
-    [property] long Width;
-
-    //-------------------------------------------------------------------------
-
-    /** contains the height of the page (in 1/100 mm).
-      */
-    [property] long Height;
-
-    //-------------------------------------------------------------------------
-
-    /** contains user defined attributes.
-      */
-    [property] com::sun::star::container::XNameContainer UserDefinedAttributes;
-
-    //-------------------------------------------------------------------------
-
-    /** contains the color of the background of the header.
-      */
-    [property] com::sun::star::util::Color HeaderBackColor;
-
-    //-------------------------------------------------------------------------
-
-    /** determines whether the header background color is transparent.
-
-        <p>If this property is set to <TRUE/>,
-        <member>PageStyle::HeaderBackColor</member> will not be used.</p>
-      */
-    [property] boolean HeaderBackTransparent;
-
-    //-------------------------------------------------------------------------
-
-    /** contains the URL of the background graphic of the header.
-      */
-    [property] string HeaderBackGraphicURL;
-
-    //-------------------------------------------------------------------------
-
-    /** contains the filter name of the background graphic of the header.
-      */
-    [property] string HeaderBackGraphicFilter;
-
-    //-------------------------------------------------------------------------
-
-    /** determines the location of the background graphic of the header.
-     */
-    [property] com::sun::star::style::GraphicLocation HeaderBackGraphicLocation;
-
-    //-------------------------------------------------------------------------
-
-    /** contains the left margin of the header (in 1/100 mm).
-      */
-    [property] long HeaderLeftMargin;
-
-    //-------------------------------------------------------------------------
-
-    /** contains the right margin of the header (in 1/100 mm).
-     */
-    [property] long HeaderRightMargin;
-
-    //-------------------------------------------------------------------------
-
-    /** determines the style of the left border line of the header.
-      */
-    [property] com::sun::star::table::BorderLine HeaderLeftBorder;
-
-    //-------------------------------------------------------------------------
-
-    /** determines the style of the right border line of the header.
-      */
-    [property] com::sun::star::table::BorderLine HeaderRightBorder;
-
-    //-------------------------------------------------------------------------
-
-    /** determines the style of the top border line of the header.
-      */
-    [property] com::sun::star::table::BorderLine HeaderTopBorder;
-
-    //-------------------------------------------------------------------------
-
-    /** determines the style of the bottom border line of the header.
-      */
-    [property] com::sun::star::table::BorderLine HeaderBottomBorder;
-
-    //-------------------------------------------------------------------------
-
-    /** determines the left border distance of the header (in 1/100 mm).
-      */
-    [property] long HeaderLeftBorderDistance;
-
-    //-------------------------------------------------------------------------
-
-    /** determines the right border distance of the header (in 1/100 mm).
-      */
-    [property] long HeaderRightBorderDistance;
-
-    //-------------------------------------------------------------------------
-
-    /** determines the top border distance of the header (in 1/100 mm).
-      */
-    [property] long HeaderTopBorderDistance;
-
-    //-------------------------------------------------------------------------
-
-    /** determines the bottom border distance of the header (in 1/100 mm).
-      */
-    [property] long HeaderBottomBorderDistance;
-
-    //-------------------------------------------------------------------------
-
-    /** determines the distance of all borders of the header (in 1/100 mm).
-      */
-    [property] long HeaderBorderDistance;
-
-    //-------------------------------------------------------------------------
-
-    /** determines the distance between the header and the body text area
-        (in 1/100 mm).
-      */
-    [property] long HeaderBodyDistance;
-
-    //-------------------------------------------------------------------------
-
-    /** determines the shadow of the header.
-      */
-    [property] com::sun::star::table::ShadowFormat HeaderShadowFormat;
-
-    //-------------------------------------------------------------------------
-
-    /** contains the height of the header (in 1/100 mm).
-      */
-    [property] long HeaderHeight;
-
-    //-------------------------------------------------------------------------
-
-    /** determines whether the height of the header depends on the content.
-      */
-    [property] boolean HeaderIsDynamicHeight;
-
-    //-------------------------------------------------------------------------
-
-    /** determines whether the header content on left and right pages
-        is the same.
-      */
-    [property] boolean HeaderIsShared;
-
-    //-------------------------------------------------------------------------
-
-    /** determines whether a header is used on the page.
-      */
-    [property] boolean HeaderIsOn;
-
-    //-------------------------------------------------------------------------
-
-    /** contains the color of the background of the footer.
-     */
-    [property] com::sun::star::util::Color FooterBackColor;
-
-    //-------------------------------------------------------------------------
-
-    /** determines whether the background is transparent.
-      */
-    [property] boolean FooterBackTransparent;
-
-    //-------------------------------------------------------------------------
-
-    /** contains the URL of the background graphic in the footer.
+    /** gives access to the pages properties.
      */
-    [property] string FooterBackGraphicURL;
-
-    //-------------------------------------------------------------------------
-
-    /** contains the filter name of the background graphic in the footer.
-      */
-    [property] string FooterBackGraphicFilter;
-
-    //-------------------------------------------------------------------------
-
-    /** determines the location of the background graphic in the footer.
-      */
-    [property] com::sun::star::style::GraphicLocation FooterBackGraphicLocation;
-
-    //-------------------------------------------------------------------------
-
-    /** determines the left margin of the footer (in 1/100 mm).
-      */
-    [property] long FooterLeftMargin;
-
-    //-------------------------------------------------------------------------
-
-    /** determines the right margin of the footer (in 1/100 mm).
-      */
-    [property] long FooterRightMargin;
-
-    //-------------------------------------------------------------------------
-
-    /** contains the style of the left border line of the footer.
-      */
-    [property] com::sun::star::table::BorderLine FooterLeftBorder;
-
-    //-------------------------------------------------------------------------
-
-    /** contains the style of the right border line of the footer.
-      */
-    [property] com::sun::star::table::BorderLine FooterRightBorder;
-
-    //-------------------------------------------------------------------------
-
-    /** contains the style of the top border line of the footer.
-      */
-    [property] com::sun::star::table::BorderLine FooterTopBorder;
-
-    //-------------------------------------------------------------------------
-
-    /** contains the style of the bottom border line of the footer.
-      */
-    [property] com::sun::star::table::BorderLine FooterBottomBorder;
-
-    //-------------------------------------------------------------------------
-
-    /** contains the left border distance of the footer (in 1/100 mm).
-      */
-    [property] long FooterLeftBorderDistance;
-
-    //-------------------------------------------------------------------------
-
-    /** contains the right border distance of the footer (in 1/100 mm).
-      */
-    [property] long FooterRightBorderDistance;
-
-    //-------------------------------------------------------------------------
-
-    /** contains the top border distance of the footer (in 1/100 mm).
-      */
-    [property] long FooterTopBorderDistance;
-
-    //-------------------------------------------------------------------------
-
-    /** contains the bottom border distance of the footer (in 1/100 mm).
-      */
-    [property] long FooterBottomBorderDistance;
-
-    //-------------------------------------------------------------------------
-
-    /** contains the distance of all borders of the footer (in 1/100 mm).
-      */
-    [property] long FooterBorderDistance;
-
-    //-------------------------------------------------------------------------
-
-    /** determines the distance between the footer and the body text area
-        (in 1/100 mm).
-      */
-    [property] long FooterBodyDistance;
-
-    //-------------------------------------------------------------------------
-
-    /** determines the shadow of the footer.
-      */
-    [property] com::sun::star::table::ShadowFormat FooterShadowFormat;
-
-    //-------------------------------------------------------------------------
-
-    /** determines the height of the footer (in 1/100 mm).
-      */
-    [property] long FooterHeight;
-
-    //-------------------------------------------------------------------------
-
-    /** determines whether the height of the footer depends on the content.
-     */
-    [property] boolean FooterIsDynamicHeight;
-
-    //-------------------------------------------------------------------------
-
-    /** determines whether the footer content on left and right pages
-        is the same.
-      */
-    [property] boolean FooterIsShared;
-
-    //-------------------------------------------------------------------------
-
-    /** determines whether a footer is used on the page.
-     */
-    [property] boolean FooterIsOn;
-
+    service com::sun::star::style::PageProperties;
 };
 
 //=============================================================================