diff options
Diffstat (limited to 'cui/source/inc')
| -rw-r--r-- | cui/source/inc/bbdlg.hxx | 13 | ||||
| -rw-r--r-- | cui/source/inc/cuihyperdlg.hxx | 2 | ||||
| -rwxr-xr-x | cui/source/inc/cuires.hrc | 6 | ||||
| -rw-r--r-- | cui/source/inc/cuitabline.hxx | 2 | ||||
| -rw-r--r-- | cui/source/inc/page.hxx | 15 | ||||
| -rw-r--r-- | cui/source/inc/transfrm.hxx | 2 |
6 files changed, 29 insertions, 11 deletions
diff --git a/cui/source/inc/bbdlg.hxx b/cui/source/inc/bbdlg.hxx index fe2ac3416c00..51cb1baf65fe 100644 --- a/cui/source/inc/bbdlg.hxx +++ b/cui/source/inc/bbdlg.hxx @@ -34,17 +34,20 @@ class SvxBorderBackgroundDlg: public SfxTabDialog { public: - SvxBorderBackgroundDlg( Window *pParent, - const SfxItemSet& rCoreSet, - sal_Bool bEnableSelector = sal_False ); + SvxBorderBackgroundDlg(Window *pParent, + const SfxItemSet& rCoreSet, + bool bEnableSelector = false, + bool bEnableDrawingLayerFillStyles = false); ~SvxBorderBackgroundDlg(); protected: - virtual void PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ); + virtual void PageCreated(sal_uInt16 nPageId,SfxTabPage& rTabPage); private: - sal_Bool bEnableBackgroundSelector; // fuer Border/Background-Dlg + /// bitfield + bool mbEnableBackgroundSelector : 1; // fuer Border/Background-Dlg + bool mbEnableDrawingLayerFillStyles : 1; // for full DrawingLayer FillStyles }; diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx index cae78241f1eb..f55ebdfa49cc 100644 --- a/cui/source/inc/cuihyperdlg.hxx +++ b/cui/source/inc/cuihyperdlg.hxx @@ -67,7 +67,7 @@ public : class SvxHpLinkDlg : public IconChoiceDialog { private: - SvxHlinkCtrl maCtrl; // Controler + SvxHlinkCtrl maCtrl; // Controller SfxBindings* mpBindings; SfxItemSet* mpItemSet; diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc index 7a0dac234d7b..17f5fc78b929 100755 --- a/cui/source/inc/cuires.hrc +++ b/cui/source/inc/cuires.hrc @@ -42,7 +42,11 @@ #define RID_SVXDLG_TEXT (RID_SVX_START + 183) #define RID_SVXDLG_TRANSFORM (RID_SVX_START + 45) #define RID_SVXDLG_LINE (RID_SVX_START + 50) -#define RID_SVXDLG_BBDLG (RID_SVX_START + 40) + +//UUUU +#define RID_SVXDLG_BBDLG_BACKGROUND (RID_SVX_START + 40) +#define RID_SVXDLG_BBDLG_AREA_TRANS (RID_SVX_START + 41) + #define RID_SVXDLG_CAPTION (RID_SVX_START + 151) #define RID_SVXDLG_AREA (RID_SVX_START + 55) #define RID_SVXSTRARY_PAPERSIZE_STD (RID_SVX_START + 142) diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index 26f2f8a2ef63..64574c0f4e2e 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -131,7 +131,7 @@ private: //#58425# Symbole auf einer Linie (z.B. StarChart) -> SdrObjList* pSymbolList; //a list of symbols to be shown in menu. Symbol at position SID_ATTR_SYMBOLTYPE is to be shown in preview. The list position is to be used cyclic. bool bNewSize; - Graphic aAutoSymbolGraphic; //a graphic to be displayed in the preview in case that an automatic symbol is choosen + Graphic aAutoSymbolGraphic; //a graphic to be displayed in the preview in case that an automatic symbol is chosen long nNumMenuGalleryItems; long nSymbolType; SfxItemSet* pSymbolAttr; //attributes for the shown symbols; only necessary if not equal to line properties diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index efc15e345169..5cb0930e0e05 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -80,7 +80,7 @@ <SvxLRSpaceItem>: <SID_ATTR_LRSPACE> */ -struct SvxPage_Impl; +//UUUU struct SvxPage_Impl; typedef sal_uInt16 MarginPosition; class SvxPageDescPage : public SfxTabPage @@ -88,6 +88,7 @@ class SvxPageDescPage : public SfxTabPage using TabPage::ActivatePage; using TabPage::DeactivatePage; +private: // paper format FixedLine aPaperSizeFl; FixedText aPaperFormatText; @@ -167,7 +168,14 @@ class SvxPageDescPage : public SfxTabPage Paper ePaperStart; Paper ePaperEnd; - SvxPage_Impl* pImpl; + //UUUU SvxPage_Impl* pImpl; + MarginPosition m_nPos; + Printer* mpDefPrinter; + + bool mbDelPrinter : 1; + + //UUUU + bool mbEnableDrawingLayerFillStyles : 1; #ifdef _SVX_PAGE_CXX void Init_Impl(); @@ -208,6 +216,9 @@ class SvxPageDescPage : public SfxTabPage SvxPageDescPage( Window* pParent, const SfxItemSet& rSet ); + //UUUU + void EnableDrawingLayerFillStyles(bool bNew) { mbEnableDrawingLayerFillStyles = bNew; } + protected: virtual void ActivatePage( const SfxItemSet& rSet ); virtual int DeactivatePage( SfxItemSet* pSet = 0 ); diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx index 9f3f155241d5..3e595c285262 100644 --- a/cui/source/inc/transfrm.hxx +++ b/cui/source/inc/transfrm.hxx @@ -134,7 +134,7 @@ private: bool mbSizeDisabled; bool mbAdjustDisabled; - // frome size + // from size // #i75273# double mfOldWidth; double mfOldHeight; |