dlgpage.cxx (79aad27f) dlgpage.cxx (c7be74b1)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 51 unchanged lines hidden (view full) ---

60 ( mpDocShell->GetItem( SID_COLOR_TABLE ) ) ) );
61 SvxGradientListItem aGradientListItem(*( (const SvxGradientListItem*)
62 ( mpDocShell->GetItem( SID_GRADIENT_LIST ) ) ) );
63 SvxBitmapListItem aBitmapListItem(*( (const SvxBitmapListItem*)
64 ( mpDocShell->GetItem( SID_BITMAP_LIST ) ) ) );
65 SvxHatchListItem aHatchListItem(*( (const SvxHatchListItem*)
66 ( mpDocShell->GetItem( SID_HATCH_LIST ) ) ) );
67
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 51 unchanged lines hidden (view full) ---

60 ( mpDocShell->GetItem( SID_COLOR_TABLE ) ) ) );
61 SvxGradientListItem aGradientListItem(*( (const SvxGradientListItem*)
62 ( mpDocShell->GetItem( SID_GRADIENT_LIST ) ) ) );
63 SvxBitmapListItem aBitmapListItem(*( (const SvxBitmapListItem*)
64 ( mpDocShell->GetItem( SID_BITMAP_LIST ) ) ) );
65 SvxHatchListItem aHatchListItem(*( (const SvxHatchListItem*)
66 ( mpDocShell->GetItem( SID_HATCH_LIST ) ) ) );
67
68 mpColorTab = aColorTableItem.GetColorTable();
69 mpGradientList = aGradientListItem.GetGradientList();
70 mpHatchingList = aHatchListItem.GetHatchList();
71 mpBitmapList = aBitmapListItem.GetBitmapList();
68 maColorTab = aColorTableItem.GetColorTable();
69 maGradientList = aGradientListItem.GetGradientList();
70 maHatchingList = aHatchListItem.GetHatchList();
71 maBitmapList = aBitmapListItem.GetBitmapList();
72
73 FreeResource();
74
75 AddTabPage( RID_SVXPAGE_PAGE);
76 AddTabPage( RID_SVXPAGE_AREA);
77
78 if(!bAreaPage) // I have to add the page before I remove it !
79 RemoveTabPage( RID_SVXPAGE_AREA );

--- 13 unchanged lines hidden (view full) ---

93 {
94 case RID_SVXPAGE_PAGE:
95 aSet.Put (SfxAllEnumItem((const sal_uInt16)SID_ENUM_PAGE_MODE, SVX_PAGE_MODE_PRESENTATION));
96 aSet.Put (SfxAllEnumItem((const sal_uInt16)SID_PAPER_START, PAPER_A0));
97 aSet.Put (SfxAllEnumItem((const sal_uInt16)SID_PAPER_END, PAPER_E));
98 rPage.PageCreated(aSet);
99 break;
100 case RID_SVXPAGE_AREA:
72
73 FreeResource();
74
75 AddTabPage( RID_SVXPAGE_PAGE);
76 AddTabPage( RID_SVXPAGE_AREA);
77
78 if(!bAreaPage) // I have to add the page before I remove it !
79 RemoveTabPage( RID_SVXPAGE_AREA );

--- 13 unchanged lines hidden (view full) ---

93 {
94 case RID_SVXPAGE_PAGE:
95 aSet.Put (SfxAllEnumItem((const sal_uInt16)SID_ENUM_PAGE_MODE, SVX_PAGE_MODE_PRESENTATION));
96 aSet.Put (SfxAllEnumItem((const sal_uInt16)SID_PAPER_START, PAPER_A0));
97 aSet.Put (SfxAllEnumItem((const sal_uInt16)SID_PAPER_END, PAPER_E));
98 rPage.PageCreated(aSet);
99 break;
100 case RID_SVXPAGE_AREA:
101 aSet.Put (SvxColorTableItem(mpColorTab,SID_COLOR_TABLE));
102 aSet.Put (SvxGradientListItem(mpGradientList,SID_GRADIENT_LIST));
103 aSet.Put (SvxHatchListItem(mpHatchingList,SID_HATCH_LIST));
104 aSet.Put (SvxBitmapListItem(mpBitmapList,SID_BITMAP_LIST));
101 aSet.Put (SvxColorTableItem(maColorTab,SID_COLOR_TABLE));
102 aSet.Put (SvxGradientListItem(maGradientList,SID_GRADIENT_LIST));
103 aSet.Put (SvxHatchListItem(maHatchingList,SID_HATCH_LIST));
104 aSet.Put (SvxBitmapListItem(maBitmapList,SID_BITMAP_LIST));
105 aSet.Put (SfxUInt16Item(SID_PAGE_TYPE,0));
106 aSet.Put (SfxUInt16Item(SID_DLG_TYPE,1));
107 aSet.Put (SfxUInt16Item(SID_TABPAGE_POS,0));
108 rPage.PageCreated(aSet);
109 break;
110 }
111}
112
113
114
105 aSet.Put (SfxUInt16Item(SID_PAGE_TYPE,0));
106 aSet.Put (SfxUInt16Item(SID_DLG_TYPE,1));
107 aSet.Put (SfxUInt16Item(SID_TABPAGE_POS,0));
108 rPage.PageCreated(aSet);
109 break;
110 }
111}
112
113
114