summaryrefslogtreecommitdiff
path: root/svx/inc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-12-03 09:38:46 +0000
committerCaolán McNamara <caolanm@redhat.com>2019-12-04 13:06:42 +0100
commitef5133e468e70966ef7499a7f1c70ffbfd89f641 (patch)
treec3b9421aeac7b0a1d710ee3d12662cf4b7508323 /svx/inc
parente15a843051890a5cb0521ec8192df7cc3ebb86d3 (diff)
drop dbgutil SdrItemBrowser FloatingWindow
Change-Id: I7a4ca90ea23271e7b6f60d7e47e4513978d3222d Reviewed-on: https://gerrit.libreoffice.org/84356 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx/inc')
-rw-r--r--svx/inc/pch/precompiled_svx.hxx5
-rw-r--r--svx/inc/pch/precompiled_svxcore.hxx3
-rw-r--r--svx/inc/svdibrow.hxx119
3 files changed, 5 insertions, 122 deletions
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index 77bbf9031b2a..a1025a3dde90 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -13,7 +13,7 @@
manual changes will be rewritten by the next run of update_pch.sh (which presumably
also fixes all possible problems, so it's usually better to use it).
- Generated on 2019-12-03 09:22:33 using:
+ Generated on 2019-12-03 09:41:31 using:
./bin/update_pch svx svx --cutoff=3 --exclude:system --exclude:module --include:local
If after updating build fails, use the following command to locate conflicting headers:
@@ -61,8 +61,11 @@
#include <rtl/instance.hxx>
#include <rtl/math.hxx>
#include <rtl/ref.hxx>
+#include <rtl/strbuf.h>
#include <rtl/string.h>
#include <rtl/string.hxx>
+#include <rtl/stringconcat.hxx>
+#include <rtl/stringutils.hxx>
#include <rtl/tencinfo.h>
#include <rtl/textenc.h>
#include <rtl/uri.hxx>
diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx
index 882b3267089d..35f4ea416ed7 100644
--- a/svx/inc/pch/precompiled_svxcore.hxx
+++ b/svx/inc/pch/precompiled_svxcore.hxx
@@ -13,7 +13,7 @@
manual changes will be rewritten by the next run of update_pch.sh (which presumably
also fixes all possible problems, so it's usually better to use it).
- Generated on 2019-12-03 09:23:12 using:
+ Generated on 2019-12-03 09:41:26 using:
./bin/update_pch svx svxcore --cutoff=7 --exclude:system --include:module --exclude:local
If after updating build fails, use the following command to locate conflicting headers:
@@ -62,7 +62,6 @@
#include <osl/interlck.h>
#include <osl/mutex.hxx>
#include <osl/process.h>
-#include <osl/thread.h>
#include <osl/time.h>
#include <rtl/alloc.h>
#include <rtl/character.hxx>
diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx
deleted file mode 100644
index defb0e260df1..000000000000
--- a/svx/inc/svdibrow.hxx
+++ /dev/null
@@ -1,119 +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_SVX_INC_SVDIBROW_HXX
-#define INCLUDED_SVX_INC_SVDIBROW_HXX
-
-#include <svtools/brwbox.hxx>
-#include <vcl/edit.hxx>
-#include <vcl/floatwin.hxx>
-#include <vcl/idle.hxx>
-#include <memory>
-
-class SfxItemSet;
-class ImpItemListRow;
-class BrowserMouseEvent;
-
-class SdrItemBrowserControl final : public BrowseBox
-{
-friend class ImpItemEdit;
- std::vector<std::unique_ptr<ImpItemListRow>> aList;
- long nCurrentPaintRow;
- VclPtr<Edit> pEditControl;
- OUString aWNameMemorized;
- Link<SdrItemBrowserControl&,void> aEntryChangedHdl;
- Link<SdrItemBrowserControl&,void> aSetDirtyHdl;
- std::unique_ptr<ImpItemListRow> pCurrentChangeEntry;
- long nLastWhichOfs;
- sal_uInt16 nLastWhich;
- bool bWhichesButNames;
- bool bDontHideIneffectiveItems;
- bool bDontSortItems;
-
- void ImpCtor();
- void ImpSetEntry(const ImpItemListRow& rEntry, std::size_t nEntryNum);
- void ImpSaveWhich();
- void ImpRestoreWhich();
- std::size_t GetCurrentPos() const;
- bool BeginChangeEntry(std::size_t nPos);
-
- virtual long GetRowCount() const override;
- virtual bool SeekRow(long nRow) override;
- virtual void PaintField(vcl::RenderContext& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId) const override;
- virtual void DoubleClick(const BrowserMouseEvent&) override;
- virtual void KeyInput(const KeyEvent& rEvt) override;
- virtual void Select() override;
- void SetDirty(); // is called for example in mode switches
- virtual tools::Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) override;
- virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint) override;
-
-public:
- SdrItemBrowserControl(vcl::Window* pParent);
- virtual ~SdrItemBrowserControl() override;
- virtual void dispose() override;
- void Clear();
- void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet);
- sal_uInt16 GetCurrentWhich() const;
- void EndChangeEntry();
- void BreakChangeEntry();
-
- /** GetCellText returns the text at the given position
- @param _nRow
- the number of the row
- @param _nColId
- the ID of the column
- @return
- the text out of the cell
- */
- virtual OUString GetCellText(long _nRow, sal_uInt16 _nColId) const override;
-
- const ImpItemListRow* GetCurrentChangeEntry() const { return pCurrentChangeEntry.get(); }
- OUString GetNewEntryValue() const { return pEditControl->GetText(); }
- void SetEntryChangedHdl(const Link<SdrItemBrowserControl&,void>& rLink) { aEntryChangedHdl=rLink; }
- void SetSetDirtyHdl(const Link<SdrItemBrowserControl&,void>& rLink) { aSetDirtyHdl=rLink; }
-};
-
-class SdrView;
-
-class SdrItemBrowser: public FloatingWindow {
- VclPtr<SdrItemBrowserControl> aBrowse;
- Idle aIdle;
- SdrView* pView;
- bool bDirty;
- static vcl::Window* ImpGetViewWin(SdrView const & rView);
- DECL_LINK(IdleHdl, Timer *, void);
- DECL_LINK(ChangedHdl, SdrItemBrowserControl&, void);
- DECL_LINK(SetDirtyHdl, SdrItemBrowserControl&, void);
-public:
- SdrItemBrowser(SdrView& rView);
- virtual ~SdrItemBrowser() override;
- void ForceParent();
- void SetDirty();
- void Undirty();
- virtual void dispose() override;
- virtual void Resize() override;
- virtual void GetFocus() override;
- void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet) { aBrowse->SetAttributes(pAttr,p2ndSet); }
- SdrItemBrowserControl *GetBrowserControl() { return aBrowse.get(); }
-};
-
-#endif // INCLUDED_SVX_INC_SVDIBROW_HXX
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */