diff options
author | Szymon Kłos <eszkadev@gmail.com> | 2016-09-28 16:08:53 +0200 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2016-09-29 07:07:58 +0000 |
commit | 558faa307d87510c2d9d12b23c12f261c424f835 (patch) | |
tree | d2f264bb7a95d9af3c426a3a598536ca16ce7339 /sw/inc | |
parent | 2bebc1fc2e76f73d953ca1e1f64803fd4c42a62c (diff) |
Page margin popup converted to use outside sidebar
Change-Id: I3c4cc20fc8f2818677a77f848a1566bb56ceb7c6
Reviewed-on: https://gerrit.libreoffice.org/29363
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'sw/inc')
-rw-r--r-- | sw/inc/PageMarginPopup.hxx | 41 | ||||
-rw-r--r-- | sw/inc/cmdid.h | 1 |
2 files changed, 42 insertions, 0 deletions
diff --git a/sw/inc/PageMarginPopup.hxx b/sw/inc/PageMarginPopup.hxx new file mode 100644 index 000000000000..52695206de85 --- /dev/null +++ b/sw/inc/PageMarginPopup.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 INCLUDED_SW_INC_PAGEMARGINPOPUP_HXX +#define INCLUDED_SW_INC_PAGEMARGINPOPUP_HXX + +#include <sfx2/tbxctrl.hxx> +#include <swdllapi.h> +#include <vcl/vclenum.hxx> +#include <functional> + +class SW_DLLPUBLIC PageMarginPopup : public SfxToolBoxControl +{ +public: + SFX_DECL_TOOLBOX_CONTROL(); + + PageMarginPopup(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx); + virtual ~PageMarginPopup() override; + + virtual VclPtr<SfxPopupWindow> CreatePopupWindow() override; +}; + +#endif + + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h index 284bcfb95dcb..30eb2f49f964 100644 --- a/sw/inc/cmdid.h +++ b/sw/inc/cmdid.h @@ -859,6 +859,7 @@ #define SID_ATTR_PAGE_FOOTER_LRMARGIN (FN_SIDEBAR + 8) #define SID_ATTR_PAGE_FOOTER_SPACING (FN_SIDEBAR + 9) #define SID_ATTR_PAGE_FOOTER_LAYOUT (FN_SIDEBAR + 10) +#define SID_ATTR_PAGE_MARGIN (FN_SIDEBAR + 11) //Member IDs for Fill / SetVariable of items #define MID_STYLE 0xe0 |