diff options
-rw-r--r-- | include/sfx2/strings.hrc | 2 | ||||
-rw-r--r-- | sd/Library_sd.mk | 1 | ||||
-rw-r--r-- | sd/inc/bitmaps.hlst | 2 | ||||
-rw-r--r-- | sd/inc/strings.hrc | 2 | ||||
-rw-r--r-- | sd/source/ui/dlg/PaneDockingWindow.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/dlg/titledockwin.cxx (renamed from sfx2/source/dialog/titledockwin.cxx) | 25 | ||||
-rw-r--r-- | sd/source/ui/inc/PaneDockingWindow.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/inc/titledockwin.hxx (renamed from include/sfx2/titledockwin.hxx) | 21 | ||||
-rw-r--r-- | sfx2/Library_sfx.mk | 1 | ||||
-rw-r--r-- | sfx2/inc/bitmaps.hlst | 2 | ||||
-rw-r--r-- | solenv/clang-format/excludelist | 4 |
11 files changed, 29 insertions, 37 deletions
diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc index 82bd1c2168a1..010b3497b089 100644 --- a/include/sfx2/strings.hrc +++ b/include/sfx2/strings.hrc @@ -292,8 +292,6 @@ #define STR_TRACK_CHANGES_BUTTON_HIDE NC_("STR_TRACK_CHANGES_BUTTON_HIDE", "Hide Toolbar") #define STR_HYPHENATION_BUTTON NC_("STR_HYPHENATION_BUTTON", "Learn more") -#define STR_CLOSE_PANE NC_("STR_CLOSE_PANE", "Close Pane") - // Translators: default Impress template names #define STR_TEMPLATE_NAME1 NC_("STR_TEMPLATE_NAME1", "Grey Elegant") #define STR_TEMPLATE_NAME2 NC_("STR_TEMPLATE_NAME2", "Beehive") diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 6705a8c572cd..1ded5eadc8ba 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -226,6 +226,7 @@ $(eval $(call gb_Library_add_exception_objects,sd,\ sd/source/ui/dlg/navigatr \ sd/source/ui/dlg/sdabstdlg \ sd/source/ui/dlg/sdtreelb \ + sd/source/ui/dlg/titledockwin \ sd/source/ui/dlg/unchss \ sd/source/ui/docshell/docshel2 \ sd/source/ui/docshell/docshel3 \ diff --git a/sd/inc/bitmaps.hlst b/sd/inc/bitmaps.hlst index 9e66e87dd032..e1c798cfae4e 100644 --- a/sd/inc/bitmaps.hlst +++ b/sd/inc/bitmaps.hlst @@ -207,4 +207,6 @@ inline constexpr OUStringLiteral BMP_MENU_PREV = u"cmd/sc_prevrecord.png"; inline constexpr OUStringLiteral BMP_MENU_FIRST = u"cmd/sc_firstrecord.png"; inline constexpr OUStringLiteral BMP_MENU_LAST = u"cmd/sc_lastrecord.png"; +inline constexpr OUStringLiteral SFX_BMP_CLOSE_DOC = u"sfx2/res/closedoc.png"; + /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc index 68be404dfaf9..c67d1c9d1579 100644 --- a/sd/inc/strings.hrc +++ b/sd/inc/strings.hrc @@ -483,4 +483,6 @@ #define RID_SVXSTR_MENU_FIRST NC_("RID_SVXSTR_MENU_FIRST", "~First Slide") #define RID_SVXSTR_MENU_LAST NC_("RID_SVXSTR_MENU_LAST", "~Last Slide") +#define STR_CLOSE_PANE NC_("STR_CLOSE_PANE", "Close Pane") + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx b/sd/source/ui/dlg/PaneDockingWindow.cxx index d2d5e4a70a71..6f7332ad9b96 100644 --- a/sd/source/ui/dlg/PaneDockingWindow.cxx +++ b/sd/source/ui/dlg/PaneDockingWindow.cxx @@ -28,7 +28,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::sfx2::TitledDockingWindow; +using ::sd::TitledDockingWindow; namespace sd { diff --git a/sfx2/source/dialog/titledockwin.cxx b/sd/source/ui/dlg/titledockwin.cxx index f9209b8e26a3..f2aa744c200d 100644 --- a/sfx2/source/dialog/titledockwin.cxx +++ b/sd/source/ui/dlg/titledockwin.cxx @@ -17,20 +17,19 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -#include <sfx2/titledockwin.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> -#include <sfx2/strings.hrc> -#include <bitmaps.hlst> -#include <sfx2/sfxresid.hxx> - #include <svl/eitem.hxx> #include <vcl/event.hxx> #include <vcl/settings.hxx> #include <vcl/toolbox.hxx> -namespace sfx2 +#include <bitmaps.hlst> +#include <strings.hrc> +#include <sdresid.hxx> +#include <titledockwin.hxx> + +namespace sd { //= TitledDockingWindow TitledDockingWindow::TitledDockingWindow( SfxBindings* i_pBindings, SfxChildWindow* i_pChildWindow, vcl::Window* i_pParent ) @@ -129,7 +128,7 @@ namespace sfx2 rRenderContext.SetTextFillColor(); } - void TitledDockingWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& i_rArea) + void TitledDockingWindow::Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle& i_rArea) { const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings(); @@ -156,15 +155,15 @@ namespace sfx2 int nInnerBottom = nOuterBottom - m_aBorder.Bottom() + 1; // Paint title bar background. - tools::Rectangle aTitleBarBox(tools::Rectangle(nOuterLeft, 0, nOuterRight, nInnerTop - 1)); + ::tools::Rectangle aTitleBarBox(::tools::Rectangle(nOuterLeft, 0, nOuterRight, nInnerTop - 1)); rRenderContext.DrawRect(aTitleBarBox); if (nInnerLeft > nOuterLeft) - rRenderContext.DrawRect(tools::Rectangle(nOuterLeft, nInnerTop, nInnerLeft, nInnerBottom)); + rRenderContext.DrawRect(::tools::Rectangle(nOuterLeft, nInnerTop, nInnerLeft, nInnerBottom)); if (nOuterRight > nInnerRight) - rRenderContext.DrawRect(tools::Rectangle(nInnerRight, nInnerTop, nOuterRight, nInnerBottom)); + rRenderContext.DrawRect(::tools::Rectangle(nInnerRight, nInnerTop, nOuterRight, nInnerBottom)); if (nInnerBottom < nOuterBottom) - rRenderContext.DrawRect(tools::Rectangle(nOuterLeft, nInnerBottom, nOuterRight, nOuterBottom)); + rRenderContext.DrawRect(::tools::Rectangle(nOuterLeft, nInnerBottom, nOuterRight, nOuterBottom)); // Paint bevel border. rRenderContext.SetFillColor(); @@ -198,7 +197,7 @@ namespace sfx2 // Get the closer bitmap and set it as right most button. m_aToolbox->InsertItem(ToolBoxItemId(1), Image(StockImage::Yes, SFX_BMP_CLOSE_DOC)); - m_aToolbox->SetQuickHelpText(ToolBoxItemId(1), SfxResId(STR_CLOSE_PANE)); + m_aToolbox->SetQuickHelpText(ToolBoxItemId(1), SdResId(STR_CLOSE_PANE)); m_aToolbox->ShowItem( ToolBoxItemId(1) ); } diff --git a/sd/source/ui/inc/PaneDockingWindow.hxx b/sd/source/ui/inc/PaneDockingWindow.hxx index b2d38d7ed873..c69cb6f94904 100644 --- a/sd/source/ui/inc/PaneDockingWindow.hxx +++ b/sd/source/ui/inc/PaneDockingWindow.hxx @@ -19,11 +19,11 @@ #pragma once -#include <sfx2/titledockwin.hxx> +#include "titledockwin.hxx" namespace sd { - class PaneDockingWindow : public ::sfx2::TitledDockingWindow + class PaneDockingWindow : public ::sd::TitledDockingWindow { public: /** Create a new docking window. diff --git a/include/sfx2/titledockwin.hxx b/sd/source/ui/inc/titledockwin.hxx index 0ba02278b694..59e7e04b3531 100644 --- a/include/sfx2/titledockwin.hxx +++ b/sd/source/ui/inc/titledockwin.hxx @@ -17,20 +17,17 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SFX2_TITLEDOCKWIN_HXX -#define INCLUDED_SFX2_TITLEDOCKWIN_HXX +#pragma once -#include <sfx2/dllapi.h> #include <sfx2/dockwin.hxx> - -#include <vcl/vclptr.hxx> #include <tools/svborder.hxx> +#include <vcl/vclptr.hxx> class ToolBox; -namespace sfx2 +namespace sd { - class SFX2_DLLPUBLIC TitledDockingWindow : public SfxDockingWindow + class TitledDockingWindow : public SfxDockingWindow { public: TitledDockingWindow( @@ -58,7 +55,7 @@ namespace sfx2 protected: // Window overridables - virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& i_rArea) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle& i_rArea) override; virtual void Resize() override; virtual void StateChanged( StateChangedType i_nType ) override; virtual void DataChanged( const DataChangedEvent& i_rDataChangedEvent ) override; @@ -71,7 +68,7 @@ namespace sfx2 void impl_resetToolBox(); private: - DECL_DLLPRIVATE_LINK( OnToolboxItemSelected, ToolBox*, void ); + DECL_LINK(OnToolboxItemSelected, ToolBox*, void); void impl_layout(); @@ -92,10 +89,6 @@ namespace sfx2 }; - -} // namespace sfx2 - - -#endif // INCLUDED_SFX2_TITLEDOCKWIN_HXX +} // namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index d790d9fef901..b38e8b1d60b8 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -210,7 +210,6 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/dialog/tabdlg \ sfx2/source/dialog/templdlg \ sfx2/source/dialog/StyleList \ - sfx2/source/dialog/titledockwin \ sfx2/source/dialog/tplcitem \ sfx2/source/dialog/tplpitem \ sfx2/source/dialog/versdlg \ diff --git a/sfx2/inc/bitmaps.hlst b/sfx2/inc/bitmaps.hlst index 708d3dd11e06..f48563d83fe9 100644 --- a/sfx2/inc/bitmaps.hlst +++ b/sfx2/inc/bitmaps.hlst @@ -64,8 +64,6 @@ inline constexpr OUStringLiteral BMP_128X128_IMPRESS_DOC = u"sfx2/res/128x128_im inline constexpr OUStringLiteral BMP_128X128_MATH_DOC = u"sfx2/res/128x128_math_doc-p.png"; inline constexpr OUStringLiteral BMP_128X128_WRITER_DOC = u"sfx2/res/128x128_writer_doc-p.png"; -inline constexpr OUStringLiteral SFX_BMP_CLOSE_DOC = u"sfx2/res/closedoc.png"; - inline constexpr OUStringLiteral SIDEBAR_CLOSE_INDICATOR = u"cmd/lc_decrementlevel.png"; inline constexpr OUStringLiteral BMP_ACTION_DEFAULT_WRITER = u"res/odt_16_8.png"; inline constexpr OUStringLiteral BMP_ACTION_DEFAULT_CALC = u"res/ods_16_8.png"; diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 374ec7c1d052..119393df542e 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -5677,7 +5677,6 @@ include/sfx2/tbxctrl.hxx include/sfx2/templatelocalview.hxx include/sfx2/thumbnailview.hxx include/sfx2/thumbnailviewitem.hxx -include/sfx2/titledockwin.hxx include/sfx2/tplpitem.hxx include/sfx2/userinputinterception.hxx include/sfx2/viewfac.hxx @@ -9680,6 +9679,7 @@ sd/source/ui/dlg/sddlgfact.hxx sd/source/ui/dlg/sdpreslt.cxx sd/source/ui/dlg/sdtreelb.cxx sd/source/ui/dlg/tabtempl.cxx +sd/source/ui/dlg/titledockwin.cxx sd/source/ui/dlg/tpaction.cxx sd/source/ui/dlg/tpoption.cxx sd/source/ui/dlg/unchss.cxx @@ -9911,6 +9911,7 @@ sd/source/ui/inc/sdxfer.hxx sd/source/ui/inc/slideshow.hxx sd/source/ui/inc/tabtempl.hxx sd/source/ui/inc/tmplctrl.hxx +sd/source/ui/inc/titledockwin.hxx sd/source/ui/inc/tools/ConfigurationAccess.hxx sd/source/ui/inc/tools/IdleDetection.hxx sd/source/ui/inc/tools/PropertySet.hxx @@ -10460,7 +10461,6 @@ sfx2/source/dialog/srchdlg.cxx sfx2/source/dialog/styledlg.cxx sfx2/source/dialog/tabdlg.cxx sfx2/source/dialog/templdlg.cxx -sfx2/source/dialog/titledockwin.cxx sfx2/source/dialog/tplcitem.cxx sfx2/source/dialog/tplpitem.cxx sfx2/source/dialog/versdlg.cxx |