diff options
| -rw-r--r-- | include/svx/itemwin.hxx | 33 | ||||
| -rw-r--r-- | solenv/clang-format/blacklist | 1 | ||||
| -rw-r--r-- | svx/source/tbxctrls/itemwin.cxx | 1 | ||||
| -rw-r--r-- | svx/source/tbxctrls/linemetricbox.hxx | 58 | ||||
| -rw-r--r-- | svx/source/tbxctrls/linewidthctrl.cxx | 1 |
5 files changed, 61 insertions, 33 deletions
diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx index f7da4cc9becf..1feb6d9fd0cf 100644 --- a/include/svx/itemwin.hxx +++ b/include/svx/itemwin.hxx @@ -24,7 +24,6 @@ #include <svx/dlgctrl.hxx> #include <svx/svxdllapi.h> -class XLineWidthItem; class SfxObjectShell; class ValueSet; class SvxLineStyleToolBoxControl; @@ -47,38 +46,6 @@ public: virtual ~SvxLineBox() override; }; -class SvxMetricField final : public InterimItemWindow -{ -private: - std::unique_ptr<weld::MetricSpinButton> m_xWidget; - int nCurValue; - MapUnit eDestPoolUnit; - FieldUnit eDlgUnit; - css::uno::Reference< css::frame::XFrame > mxFrame; - - DECL_LINK(ModifyHdl, weld::MetricSpinButton&, void); - DECL_LINK(KeyInputHdl, const KeyEvent&, bool); - DECL_LINK(FocusInHdl, weld::Widget&, void); - - static void ReleaseFocus_Impl(); - - virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; - - virtual void GetFocus() override; - -public: - SvxMetricField( vcl::Window* pParent, - const css::uno::Reference< css::frame::XFrame >& rFrame ); - virtual void dispose() override; - virtual ~SvxMetricField() override; - - void Update( const XLineWidthItem* pItem ); - void SetDestCoreUnit( MapUnit eUnit ); - void RefreshDlgUnit(); - - void set_sensitive(bool bSensitive); -}; - namespace SvxFillTypeBox { SVX_DLLPUBLIC void Fill(weld::ComboBox& rListBox); diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index aa7308cae883..0a1f66334c8c 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -13889,6 +13889,7 @@ svx/source/tbxctrls/itemwin.cxx svx/source/tbxctrls/layctrl.cxx svx/source/tbxctrls/lboxctrl.cxx svx/source/tbxctrls/linectrl.cxx +svx/source/tbxctrls/linemetricbox.hxx svx/source/tbxctrls/linewidthctrl.cxx svx/source/tbxctrls/tbcontrl.cxx svx/source/tbxctrls/tbunocontroller.cxx diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index 68dca2e43ad9..0b0ee21ee513 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -36,6 +36,7 @@ #include <svx/xtable.hxx> #include <svx/itemwin.hxx> #include <svtools/unitconv.hxx> +#include "linemetricbox.hxx" using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/svx/source/tbxctrls/linemetricbox.hxx b/svx/source/tbxctrls/linemetricbox.hxx new file mode 100644 index 000000000000..ca6d36740779 --- /dev/null +++ b/svx/source/tbxctrls/linemetricbox.hxx @@ -0,0 +1,58 @@ +/* -*- 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 . + */ +#pragma once + +#include <svtools/InterimItemWindow.hxx> +#include <svx/svxdllapi.h> + +class XLineWidthItem; + +class SvxMetricField final : public InterimItemWindow +{ +private: + std::unique_ptr<weld::MetricSpinButton> m_xWidget; + int nCurValue; + MapUnit eDestPoolUnit; + FieldUnit eDlgUnit; + css::uno::Reference< css::frame::XFrame > mxFrame; + + DECL_LINK(ModifyHdl, weld::MetricSpinButton&, void); + DECL_LINK(KeyInputHdl, const KeyEvent&, bool); + DECL_LINK(FocusInHdl, weld::Widget&, void); + + static void ReleaseFocus_Impl(); + + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; + + virtual void GetFocus() override; + +public: + SvxMetricField( vcl::Window* pParent, + const css::uno::Reference< css::frame::XFrame >& rFrame ); + virtual void dispose() override; + virtual ~SvxMetricField() override; + + void Update( const XLineWidthItem* pItem ); + void SetDestCoreUnit( MapUnit eUnit ); + void RefreshDlgUnit(); + + void set_sensitive(bool bSensitive); +}; + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/tbxctrls/linewidthctrl.cxx b/svx/source/tbxctrls/linewidthctrl.cxx index 148bb6a36c88..256793a7e3d4 100644 --- a/svx/source/tbxctrls/linewidthctrl.cxx +++ b/svx/source/tbxctrls/linewidthctrl.cxx @@ -24,6 +24,7 @@ #include <svx/xlnwtit.hxx> #include <svx/linectrl.hxx> #include <svx/itemwin.hxx> +#include "linemetricbox.hxx" using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; |