diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-08-30 21:22:35 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-08-31 09:14:40 +0200 |
| commit | af24eaef7a9a8b8e5adf297901d08273342e7e93 (patch) | |
| tree | dbc3aa3722d855bf11d230d0e2edfa5cffac9be5 /sfx2/source/inc | |
| parent | 48cff413e21830e3da4df8cb55540e68a4f009a6 (diff) | |
flatten SfxTbxCtrlFactArr_Impl
Change-Id: I422aeeb446a49fa4449eabe0c3643f125856db12
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121330
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2/source/inc')
| -rw-r--r-- | sfx2/source/inc/appdata.hxx | 4 | ||||
| -rw-r--r-- | sfx2/source/inc/ctrlfactoryimpl.hxx | 44 |
2 files changed, 2 insertions, 46 deletions
diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx index 2f15933944f2..589497b757d2 100644 --- a/sfx2/source/inc/appdata.hxx +++ b/sfx2/source/inc/appdata.hxx @@ -94,8 +94,8 @@ public: sal_uInt16 nDocModalMode; // counts documents in modal mode sal_uInt16 nRescheduleLocks; - std::unique_ptr<SfxTbxCtrlFactArr_Impl> - pTbxCtrlFac; + std::vector<SfxTbxCtrlFactory> + maTbxCtrlFactories; std::vector<SfxStbCtrlFactory> maStbCtrlFactories; std::unique_ptr<SfxViewFrameArr_Impl> diff --git a/sfx2/source/inc/ctrlfactoryimpl.hxx b/sfx2/source/inc/ctrlfactoryimpl.hxx deleted file mode 100644 index 465ddae60b2a..000000000000 --- a/sfx2/source/inc/ctrlfactoryimpl.hxx +++ /dev/null @@ -1,44 +0,0 @@ -/* -*- 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_SFX2_CTRLFACTORYIMPL_HXX -#define INCLUDED_SFX2_CTRLFACTORYIMPL_HXX - -#include <sfx2/stbitem.hxx> -#include <sfx2/tbxctrl.hxx> - -#include <vector> - -class SfxTbxCtrlFactArr_Impl -{ - typedef std::vector<SfxTbxCtrlFactory> DataType; - DataType maData; - -public: - const SfxTbxCtrlFactory& operator[](size_t i) const; - SfxTbxCtrlFactory& operator[](size_t i); - - void push_back(const SfxTbxCtrlFactory&); - - size_t size() const; -}; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |