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/source/ui/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/source/ui/inc')
| -rw-r--r-- | sw/source/ui/inc/frmui.hrc | 1 | ||||
| -rw-r--r-- | sw/source/ui/inc/uiborder.hxx | 41 |
2 files changed, 42 insertions, 0 deletions
diff --git a/sw/source/ui/inc/frmui.hrc b/sw/source/ui/inc/frmui.hrc index ae14bbb4e035..4e765f9c9456 100644 --- a/sw/source/ui/inc/frmui.hrc +++ b/sw/source/ui/inc/frmui.hrc @@ -44,6 +44,7 @@ #define STR_TOPPRT (STR_FRMDLG_BEGIN + 1) +#define STR_BORDER (STR_FRMDLG_BEGIN + 16) #define STR_COLUMN (STR_FRMDLG_BEGIN + 17) #define STR_CHAR (STR_FRMDLG_BEGIN + 19) diff --git a/sw/source/ui/inc/uiborder.hxx b/sw/source/ui/inc/uiborder.hxx new file mode 100644 index 000000000000..78adaeb7846d --- /dev/null +++ b/sw/source/ui/inc/uiborder.hxx @@ -0,0 +1,41 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ +#ifndef _UIBORDER_HXX +#define _UIBORDER_HXX + +#include <sfx2/basedlgs.hxx> +class Window; +class SfxItemSet; + +class SwBorderDlg : public SfxSingleTabDialog +{ +public: + + // nType may be: + // SW_BORDER_MODE_PARA + // SW_BORDER_MODE_TABLE + // SW_BORDER_MODE_FRAME + + SwBorderDlg(Window* pParent, SfxItemSet& rSet, sal_uInt16 nType); + ~SwBorderDlg(); +}; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |