summaryrefslogtreecommitdiff
path: root/cui/source
diff options
context:
space:
mode:
Diffstat (limited to 'cui/source')
-rw-r--r--cui/source/dialogs/cuicharmap.cxx2
-rw-r--r--cui/source/factory/cuiexp.cxx2
-rw-r--r--cui/source/factory/dlgfact.cxx2
-rw-r--r--cui/source/factory/dlgfact.hxx1
-rw-r--r--cui/source/factory/init.cxx2
-rw-r--r--cui/source/inc/cuicharmap.hxx177
-rw-r--r--cui/source/inc/numpages.hxx22
-rw-r--r--cui/source/tabpages/autocdlg.cxx2
-rw-r--r--cui/source/tabpages/chardlg.cxx2
-rw-r--r--cui/source/tabpages/numpages.cxx2
10 files changed, 8 insertions, 206 deletions
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index 48cd29e58f37..7999aaba15a2 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -37,7 +37,7 @@
#include <comphelper/dispatchcommand.hxx>
#include <dialmgr.hxx>
-#include <cuicharmap.hxx>
+#include <cui/cuicharmap.hxx>
#include <sfx2/request.hxx>
#include <sfx2/sfxsids.hrc>
#include <sfx2/app.hxx>
diff --git a/cui/source/factory/cuiexp.cxx b/cui/source/factory/cuiexp.cxx
index e3c13320172f..7c46eee53c93 100644
--- a/cui/source/factory/cuiexp.cxx
+++ b/cui/source/factory/cuiexp.cxx
@@ -38,7 +38,7 @@
#include <postdlg.hxx>
#include <passwdomdlg.hxx>
#include <screenshotannotationdlg.hxx>
-#include <cuicharmap.hxx>
+#include <cui/cuicharmap.hxx>
#include <cuihyperdlg.hxx>
#include <cfgutil.hxx>
#include <SignatureLineDialog.hxx>
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 7cb8b4335921..ca48341081fc 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -32,7 +32,7 @@
#include <dstribut.hxx>
#include <cuiimapwnd.hxx>
#include <hlmarkwn.hxx>
-#include <cuicharmap.hxx>
+#include <cui/cuicharmap.hxx>
#include <srchxtra.hxx>
#include <textanim.hxx>
#include <autocdlg.hxx>
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index f0e7fc98ec57..1a64bc9adbdd 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -775,7 +775,6 @@ public:
// #i68101#
virtual VclPtr<AbstractSvxObjectNameDialog> CreateSvxObjectNameDialog(weld::Window* pParent, const OUString& rName) override;
virtual VclPtr<AbstractSvxObjectTitleDescDialog> CreateSvxObjectTitleDescDialog(weld::Window* pParent, const OUString& rTitle, const OUString& rDescription) override;
-
virtual VclPtr<AbstractSvxMultiPathDialog> CreateSvxMultiPathDialog(weld::Window* pParent) override;
virtual VclPtr<AbstractSvxMultiPathDialog> CreateSvxPathSelectDialog(weld::Window* pParent) override;
virtual VclPtr<AbstractSvxHpLinkDlg> CreateSvxHpLinkDlg(vcl::Window* pParent, SfxBindings* pBindings) override;
diff --git a/cui/source/factory/init.cxx b/cui/source/factory/init.cxx
index f4b0b67328a9..eb3a99d2dfa5 100644
--- a/cui/source/factory/init.cxx
+++ b/cui/source/factory/init.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <cuicharmap.hxx>
+#include <cui/cuicharmap.hxx>
// hook to call special character dialog for edits
// caution: needs C-Linkage since dynamically loaded via symbol name
diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx
deleted file mode 100644
index 95e65f170c44..000000000000
--- a/cui/source/inc/cuicharmap.hxx
+++ /dev/null
@@ -1,177 +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_CUI_SOURCE_INC_CUICHARMAP_HXX
-#define INCLUDED_CUI_SOURCE_INC_CUICHARMAP_HXX
-
-#include <vcl/customweld.hxx>
-#include <vcl/weld.hxx>
-#include <vcl/virdev.hxx>
-#include <sfx2/basedlgs.hxx>
-#include <svl/itemset.hxx>
-#include <svx/charmap.hxx>
-#include <svx/searchcharmap.hxx>
-#include <sfx2/charwin.hxx>
-
-using namespace ::com::sun::star;
-class SubsetMap;
-
-#define CHARMAP_MAXLEN 32
-
-namespace svx
-{
- struct SvxShowCharSetItem;
-}
-
-class SvxShowText : public weld::CustomWidgetController
-{
-private:
- ScopedVclPtr<VirtualDevice> m_xVirDev;
- OUString m_sText;
- long mnY;
- bool mbCenter;
- vcl::Font m_aFont;
-
- virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) override;
- virtual void Resize() override;
- virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override;
-public:
- SvxShowText(const VclPtr<VirtualDevice>& rVirDev);
-
- void SetFont(const vcl::Font& rFont);
- vcl::Font const & GetFont() const { return m_aFont; }
- void SetText(const OUString& rText);
- OUString const & GetText() const { return m_sText; }
- void SetCentered(bool bCenter) { mbCenter = bCenter; }
-
- Size get_preferred_size() const { return GetDrawingArea()->get_preferred_size(); }
-};
-
-/** The main purpose of this dialog is to enable the use of characters
- that are not easily accessible from the keyboard. */
-class SvxCharacterMap : public SfxDialogController
-{
-private:
-
- void init();
-
- ScopedVclPtr<VirtualDevice> m_xVirDev;
- vcl::Font aFont;
- std::unique_ptr<const SubsetMap> pSubsetMap;
- bool isSearchMode;
- css::uno::Reference<css::frame::XFrame> m_xFrame;
- std::deque<OUString> maRecentCharList;
- std::deque<OUString> maRecentCharFontList;
- std::deque<OUString> maFavCharList;
- std::deque<OUString> maFavCharFontList;
- uno::Reference< uno::XComponentContext > mxContext;
-
- SvxCharView m_aRecentCharView[16];
- SvxCharView m_aFavCharView[16];
- SvxShowText m_aShowChar;
-
- std::unique_ptr<weld::Button> m_xOKBtn;
- std::unique_ptr<weld::Label> m_xFontText;
- std::unique_ptr<weld::ComboBox> m_xFontLB;
- std::unique_ptr<weld::Label> m_xSubsetText;
- std::unique_ptr<weld::ComboBox> m_xSubsetLB;
- std::unique_ptr<weld::Entry> m_xSearchText;
- std::unique_ptr<weld::Entry> m_xHexCodeText;
- std::unique_ptr<weld::Entry> m_xDecimalCodeText;
- std::unique_ptr<weld::Button> m_xFavouritesBtn;
- std::unique_ptr<weld::Label> m_xCharName;
- std::unique_ptr<weld::Widget> m_xRecentGrid;
- std::unique_ptr<weld::Widget> m_xFavGrid;
- std::unique_ptr<weld::CustomWeld> m_xShowChar;
- std::unique_ptr<weld::CustomWeld> m_xRecentCharView[16];
- std::unique_ptr<weld::CustomWeld> m_xFavCharView[16];
- std::unique_ptr<SvxShowCharSet> m_xShowSet;
- std::unique_ptr<weld::CustomWeld> m_xShowSetArea;
- std::unique_ptr<SvxSearchCharSet> m_xSearchSet;
- std::unique_ptr<weld::CustomWeld> m_xSearchSetArea;
-
- std::unique_ptr<SfxAllItemSet> m_xOutputSet;
-
- enum class Radix : sal_Int16 {decimal = 10, hexadecimal=16};
-
- DECL_LINK(FontSelectHdl, weld::ComboBox&, void);
- DECL_LINK(SubsetSelectHdl, weld::ComboBox&, void);
- DECL_LINK(CharDoubleClickHdl, SvxShowCharSet*,void);
- DECL_LINK(CharSelectHdl, SvxShowCharSet*, void);
- DECL_LINK(CharHighlightHdl, SvxShowCharSet*, void);
- DECL_LINK(CharPreSelectHdl, SvxShowCharSet*, void);
- DECL_LINK(FavClickHdl, SvxShowCharSet*,void);
- DECL_LINK(SearchCharDoubleClickHdl, SvxShowCharSet*,void);
- DECL_LINK(SearchCharSelectHdl, SvxShowCharSet*, void);
- DECL_LINK(SearchCharHighlightHdl, SvxShowCharSet*, void);
- DECL_LINK(SearchCharPreSelectHdl, SvxShowCharSet*, void);
- DECL_LINK(DecimalCodeChangeHdl, weld::Entry&, void);
- DECL_LINK(HexCodeChangeHdl, weld::Entry&, void);
- DECL_LINK(CharClickHdl, SvxCharView*, void);
- DECL_LINK(RecentClearClickHdl, SvxCharView*, void);
- DECL_LINK(FavClearClickHdl, SvxCharView*, void);
- DECL_LINK(RecentClearAllClickHdl, SvxCharView*, void);
- DECL_LINK(FavClearAllClickHdl, SvxCharView*, void);
- DECL_LINK(InsertClickHdl, weld::Button&, void);
- DECL_LINK(FavSelectHdl, weld::Button&, void);
- DECL_LINK(SearchUpdateHdl, weld::Entry&, void);
- DECL_LINK(SearchFieldGetFocusHdl, weld::Widget&, void);
-
- static void fillAllSubsets(weld::ComboBox& rListBox);
- void selectCharByCode(Radix radix);
-
-public:
- SvxCharacterMap(weld::Window* pParent, const SfxItemSet* pSet,
- const css::uno::Reference<css::frame::XFrame>& rFrame);
- virtual short run() override;
-
- void set_title(const OUString& rTitle) { m_xDialog->set_title(rTitle); }
-
- const SfxItemSet* GetOutputItemSet() const { return m_xOutputSet.get(); }
-
- void DisableFontSelection();
-
- const vcl::Font& GetCharFont() const { return aFont;}
- void SetCharFont( const vcl::Font& rFont );
-
- void SetChar( sal_UCS4 );
- sal_UCS4 GetChar() const;
-
- void getRecentCharacterList(); //gets both recent char and recent char font list
- void updateRecentCharacterList(const OUString& rChar, const OUString& rFont);
-
- void getFavCharacterList(); //gets both Fav char and Fav char font list
- void updateFavCharacterList(const OUString& rChar, const OUString& rFont);
- void deleteFavCharacterFromList(const OUString& rChar, const OUString& rFont);
- bool isFavChar(const OUString& sTitle, const OUString& rFont);
-
- void updateRecentCharControl();
- void insertCharToDoc(const OUString& sChar);
-
- void updateFavCharControl();
- void setFavButtonState(const OUString& sTitle, const OUString& rFont);
-
- void setCharName(sal_UCS4 nDecimalValue);
-
- void toggleSearchView(bool state);
-};
-
-#endif
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index dda1de56c2ce..183f1d7825ac 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -28,6 +28,7 @@
#include <editeng/svxenum.hxx>
#include <svtools/ctrlbox.hxx>
#include <vcl/customweld.hxx>
+#include <cui/numberingpreview.hxx>
#define MN_GALLERY_ENTRY 100
@@ -38,27 +39,6 @@ class SvxBmpNumValueSet;
class SvxBrushItem;
class ValueSet;
-class SvxNumberingPreview : public weld::CustomWidgetController
-{
- const SvxNumRule* pActNum;
- vcl::Font aStdFont;
- bool bPosition;
- sal_uInt16 nActLevel;
-
-protected:
- virtual void Paint( vcl::RenderContext& rRenderContext, const ::tools::Rectangle& rRect ) override;
-
-public:
- SvxNumberingPreview();
-
- void SetNumRule(const SvxNumRule* pNum)
- {pActNum = pNum; Invalidate();};
- void SetPositionMode()
- { bPosition = true;}
- void SetLevel(sal_uInt16 nSet) {nActLevel = nSet;}
-
-};
-
struct SvxNumSettings_Impl
{
SvxNumType nNumberType;
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 00c409916d42..9245e8784966 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -48,7 +48,7 @@
#include <autocdlg.hxx>
#include <editeng/acorrcfg.hxx>
#include <editeng/svxacorr.hxx>
-#include <cuicharmap.hxx>
+#include <cui/cuicharmap.hxx>
#include <strings.hrc>
#include <editeng/unolingu.hxx>
#include <dialmgr.hxx>
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 1422602fc5b9..de5d7e233013 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -55,7 +55,7 @@
#include <svx/dlgutil.hxx>
#include <dialmgr.hxx>
#include <sfx2/htmlmode.hxx>
-#include <cuicharmap.hxx>
+#include <cui/cuicharmap.hxx>
#include "chardlg.h"
#include <editeng/emphasismarkitem.hxx>
#include <editeng/charreliefitem.hxx>
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 4c8a9bd21f28..eb4356342a90 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -38,7 +38,7 @@
#include <sfx2/objsh.hxx>
#include <vcl/graph.hxx>
#include <vcl/settings.hxx>
-#include <cuicharmap.hxx>
+#include <cui/cuicharmap.hxx>
#include <editeng/flstitem.hxx>
#include <svx/dlgutil.hxx>
#include <svx/xtable.hxx>
generated by cgit v1.2.1 (git 2.18.0) at 2023-05-29 08:28:22 +0000