diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-02-27 08:32:54 +0100 |
|---|---|---|
| committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-02-27 08:32:54 +0100 |
| commit | f73ffb91b85422067274fafc0d411aef8a6e6abb (patch) | |
| tree | ddcdd880d45643557ad4172f22b3a1de5db44a2f /sw/inc | |
| parent | 5c57c9b6eb30265fe7312ff2b4d6ce7363cf2006 (diff) | |
fdo#73159 Make back border dialog work again
I removed border dialog with commit
8560fb88c7252e5ad60674e447f2e194298f08de
because it seems unused and when the corresponding
command was called only a blank window was opened.
It seems it was just bugous, so revert this commit
and fix the dialog.
Conflicts:
sw/inc/swabstdlg.hxx
sw/source/ui/dialog/swdlgfact.cxx
sw/source/ui/dialog/swdlgfact.hxx
Change-Id: I68f8c13457e899a894f03bdd60ebedfb2b70afea
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/cmdid.h | 1 | ||||
| -rw-r--r-- | sw/inc/dialog.hrc | 1 | ||||
| -rw-r--r-- | sw/inc/swabstdlg.hxx | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h index 4ed35a4d1a8f..303642a621d6 100644 --- a/sw/inc/cmdid.h +++ b/sw/inc/cmdid.h @@ -326,6 +326,7 @@ included in c-context files, so c++ style stuff will cause problems. #define FN_FORMAT_PAGE_SETTING_DLG (FN_FORMAT + 42) /* */ #define FN_NUM_FORMAT_TABLE_DLG (FN_FORMAT + 45) /* number format in table */ +#define FN_FORMAT_BORDER_DLG (FN_FORMAT + 48) /* */ #define FN_FORMAT_PAGE_COLUMN_DLG (FN_FORMAT + 49) /* columns per page */ #define FN_FORMAT_BACKGROUND_DLG (FN_FORMAT + 50) /* background */ #define FN_FORMAT_PAGE_DLG (FN_FORMAT + 52) /* page */ diff --git a/sw/inc/dialog.hrc b/sw/inc/dialog.hrc index b39567516224..f95ef0fda046 100644 --- a/sw/inc/dialog.hrc +++ b/sw/inc/dialog.hrc @@ -54,6 +54,7 @@ #define RC_DLG_ADDR (RC_DIALOG_BEGIN + 90) #define RC_SWDLG_BACKGROUND (RC_DIALOG_BEGIN + 91) #define RC_DLG_SWNUMFMTDLG (RC_DIALOG_BEGIN + 92) +#define RC_DLG_SWBORDERDLG (RC_DIALOG_BEGIN + 93) #define RC_DLG_SWWRAPDLG (RC_DIALOG_BEGIN + 94) #define RC_DLG_SWFLDEDITDLG (RC_DIALOG_BEGIN + 95) // Ueberlaufpruefung ******************************************************** diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index a6bfa51085b8..925da1bfb578 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -373,6 +373,7 @@ public: virtual AbstractSwAutoFormatDlg * CreateSwAutoFormatDlg( Window* pParent, SwWrtShell* pShell, sal_Bool bSetAutoFmt = sal_True, const SwTableAutoFmt* pSelFmt = 0 ) = 0; + virtual SfxAbstractDialog * CreateSwBorderDlg ( Window* pParent, SfxItemSet& rSet, sal_uInt16 nType, int nResId ) = 0; virtual SfxAbstractDialog * CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, sal_Bool bDrawMode, int nResId ) = 0; virtual VclAbstractDialog * CreateSwTableWidthDlg(Window *pParent, SwTableFUNC &rFnc) = 0; |