summaryrefslogtreecommitdiff
path: root/sc/source/ui
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui')
-rw-r--r--sc/source/ui/drawfunc/chartsh.cxx4
-rw-r--r--sc/source/ui/drawfunc/drawsh2.cxx6
-rw-r--r--sc/source/ui/drawfunc/drformsh.cxx4
-rw-r--r--sc/source/ui/drawfunc/drtxtob.cxx4
-rw-r--r--sc/source/ui/drawfunc/graphsh.cxx4
-rw-r--r--sc/source/ui/drawfunc/mediash.cxx4
-rw-r--r--sc/source/ui/drawfunc/oleobjsh.cxx4
-rw-r--r--sc/source/ui/sidebar/AlignmentPropertyPanel.cxx2
-rw-r--r--sc/source/ui/sidebar/AlignmentPropertyPanel.hxx4
-rw-r--r--sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx2
-rw-r--r--sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx4
-rw-r--r--sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx2
-rw-r--r--sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx4
-rw-r--r--sc/source/ui/view/auditsh.cxx4
-rw-r--r--sc/source/ui/view/cellsh.cxx4
-rw-r--r--sc/source/ui/view/editsh.cxx4
-rw-r--r--sc/source/ui/view/pivotsh.cxx4
-rw-r--r--sc/source/ui/view/tabvwsh4.cxx2
18 files changed, 33 insertions, 33 deletions
diff --git a/sc/source/ui/drawfunc/chartsh.cxx b/sc/source/ui/drawfunc/chartsh.cxx
index 56cdadb10ff9..b07f8b93f9c2 100644
--- a/sc/source/ui/drawfunc/chartsh.cxx
+++ b/sc/source/ui/drawfunc/chartsh.cxx
@@ -25,7 +25,7 @@
#include <sfx2/app.hxx>
#include <sfx2/objface.hxx>
#include <sfx2/request.hxx>
-#include <sfx2/sidebar/EnumContext.hxx>
+#include <vcl/EnumContext.hxx>
#include <svl/whiter.hxx>
#include <vcl/msgbox.hxx>
@@ -61,7 +61,7 @@ ScChartShell::ScChartShell(ScViewData* pData) :
{
SetHelpId( HID_SCSHELL_CHARTSH );
SetName( "ChartObject" );
- SfxShell::SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_Chart));
+ SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context_Chart));
}
ScChartShell::~ScChartShell()
diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx
index 6ee0f37ae564..ca7f898f834d 100644
--- a/sc/source/ui/drawfunc/drawsh2.cxx
+++ b/sc/source/ui/drawfunc/drawsh2.cxx
@@ -58,7 +58,7 @@ ScDrawShell::ScDrawShell( ScViewData* pData ) :
mpSelectionChangeHandler(new svx::sidebar::SelectionChangeHandler(
[this] () { return this->GetSidebarContextName(); },
GetFrame()->GetFrame().GetController(),
- sfx2::sidebar::EnumContext::Context_Cell))
+ vcl::EnumContext::Context_Cell))
{
SetPool( &pViewData->GetScDrawView()->GetModel()->GetItemPool() );
::svl::IUndoManager* pMgr = pViewData->GetSfxDocShell()->GetUndoManager();
@@ -395,13 +395,13 @@ void ScDrawShell::Activate (const bool bMDI)
ContextChangeEventMultiplexer::NotifyContextChange(
GetFrame()->GetFrame().GetController(),
- ::sfx2::sidebar::EnumContext::GetContextEnum(
+ vcl::EnumContext::GetContextEnum(
GetSidebarContextName()));
}
::rtl::OUString ScDrawShell::GetSidebarContextName()
{
- return sfx2::sidebar::EnumContext::GetContextName(
+ return vcl::EnumContext::GetContextName(
svx::sidebar::SelectionAnalyzer::GetContextForSelection_SC(
GetDrawView()->GetMarkedObjectList()));
}
diff --git a/sc/source/ui/drawfunc/drformsh.cxx b/sc/source/ui/drawfunc/drformsh.cxx
index bea35a866d7b..28b5e4fa880f 100644
--- a/sc/source/ui/drawfunc/drformsh.cxx
+++ b/sc/source/ui/drawfunc/drformsh.cxx
@@ -35,7 +35,7 @@
#include "drawview.hxx"
#include "scresid.hxx"
#include <svx/svdobj.hxx>
-#include <sfx2/sidebar/EnumContext.hxx>
+#include <vcl/EnumContext.hxx>
#define ScDrawFormShell
#include "scslots.hxx"
@@ -56,7 +56,7 @@ ScDrawFormShell::ScDrawFormShell(ScViewData* pData) :
{
SetHelpId(HID_SCSHELL_DRAWFORMSH);
SetName("DrawForm");
- SfxShell::SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_Form));
+ SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context_Form));
}
ScDrawFormShell::~ScDrawFormShell()
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx
index f98b27dcb567..4a305db3599d 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -61,7 +61,7 @@
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
-#include <sfx2/sidebar/EnumContext.hxx>
+#include <vcl/EnumContext.hxx>
#include "sc.hrc"
#include "globstr.hrc"
@@ -127,7 +127,7 @@ ScDrawTextObjectBar::ScDrawTextObjectBar(ScViewData* pData) :
SetHelpId( HID_SCSHELL_DRTXTOB );
SetName("DrawText");
- SfxShell::SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_DrawText));
+ SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context_DrawText));
}
ScDrawTextObjectBar::~ScDrawTextObjectBar()
diff --git a/sc/source/ui/drawfunc/graphsh.cxx b/sc/source/ui/drawfunc/graphsh.cxx
index bf09e7500fe7..4176a5a837f5 100644
--- a/sc/source/ui/drawfunc/graphsh.cxx
+++ b/sc/source/ui/drawfunc/graphsh.cxx
@@ -21,7 +21,7 @@
#include <sfx2/app.hxx>
#include <sfx2/objface.hxx>
#include <sfx2/request.hxx>
-#include <sfx2/sidebar/EnumContext.hxx>
+#include <vcl/EnumContext.hxx>
#include <sfx2/opengrf.hxx>
#include <svl/whiter.hxx>
#include <svx/svdograf.hxx>
@@ -58,7 +58,7 @@ ScGraphicShell::ScGraphicShell(ScViewData* pData) :
{
SetHelpId(HID_SCSHELL_GRAPHIC);
SetName("GraphicObject");
- SfxShell::SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_Graphic));
+ SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context_Graphic));
}
ScGraphicShell::~ScGraphicShell()
diff --git a/sc/source/ui/drawfunc/mediash.cxx b/sc/source/ui/drawfunc/mediash.cxx
index e89733a84701..4ddeec4c2abd 100644
--- a/sc/source/ui/drawfunc/mediash.cxx
+++ b/sc/source/ui/drawfunc/mediash.cxx
@@ -24,7 +24,7 @@
#include <svl/whiter.hxx>
#include <svx/svdomedia.hxx>
#include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx>
-#include <sfx2/sidebar/EnumContext.hxx>
+#include <vcl/EnumContext.hxx>
#include "mediash.hxx"
#include "sc.hrc"
@@ -50,7 +50,7 @@ ScMediaShell::ScMediaShell(ScViewData* pData) :
{
SetHelpId(HID_SCSHELL_MEDIA);
SetName( OUString( ScResId( SCSTR_MEDIASHELL ) ) );
- SfxShell::SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_Media));
+ SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context_Media));
}
ScMediaShell::~ScMediaShell()
diff --git a/sc/source/ui/drawfunc/oleobjsh.cxx b/sc/source/ui/drawfunc/oleobjsh.cxx
index 6c2ff3d34bff..e3096ebb3815 100644
--- a/sc/source/ui/drawfunc/oleobjsh.cxx
+++ b/sc/source/ui/drawfunc/oleobjsh.cxx
@@ -35,7 +35,7 @@
#include "drawview.hxx"
#include "scresid.hxx"
#include <svx/svdobj.hxx>
-#include <sfx2/sidebar/EnumContext.hxx>
+#include <vcl/EnumContext.hxx>
#define ScOleObjectShell
#include "scslots.hxx"
@@ -56,7 +56,7 @@ ScOleObjectShell::ScOleObjectShell(ScViewData* pData) :
{
SetHelpId(HID_SCSHELL_OLEOBEJCTSH);
SetName("OleObject");
- SfxShell::SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_OLE));
+ SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context_OLE));
}
ScOleObjectShell::~ScOleObjectShell()
diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
index 8762aad0f824..463c90b29cc6 100644
--- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
@@ -247,7 +247,7 @@ void AlignmentPropertyPanel::DataChanged(
}
void AlignmentPropertyPanel::HandleContextChange(
- const ::sfx2::sidebar::EnumContext& rContext)
+ const vcl::EnumContext& rContext)
{
if (maContext == rContext)
{
diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx
index 1ae9b98f6b3d..c5c0dea4f8a7 100644
--- a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx
+++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx
@@ -50,7 +50,7 @@ public:
const DataChangedEvent& rEvent) override;
virtual void HandleContextChange(
- const ::sfx2::sidebar::EnumContext& rContext) override;
+ const vcl::EnumContext& rContext) override;
virtual void NotifyItemUpdate(
const sal_uInt16 nSId,
@@ -93,7 +93,7 @@ private:
/// bitfield
bool mbMultiDisable : 1;
- ::sfx2::sidebar::EnumContext maContext;
+ vcl::EnumContext maContext;
SfxBindings* mpBindings;
DECL_LINK_TYPED( MFLeftIndentMdyHdl, Edit&, void );
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
index e653c17e8a5a..a4251454885a 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
@@ -245,7 +245,7 @@ void CellAppearancePropertyPanel::DataChanged(
(void)rEvent;
}
-void CellAppearancePropertyPanel::HandleContextChange(const ::sfx2::sidebar::EnumContext& rContext)
+void CellAppearancePropertyPanel::HandleContextChange(const vcl::EnumContext& rContext)
{
if (maContext == rContext)
{
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
index f8cddae8d0a8..1aefb2a06fb5 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
@@ -59,7 +59,7 @@ public:
const DataChangedEvent& rEvent) override;
virtual void HandleContextChange(
- const ::sfx2::sidebar::EnumContext& rContext) override;
+ const vcl::EnumContext& rContext) override;
virtual void NotifyItemUpdate(
const sal_uInt16 nSId,
@@ -136,7 +136,7 @@ private:
std::unique_ptr< CellLineStylePopup > mpCellLineStylePopup;
std::unique_ptr< CellBorderStylePopup > mpCellBorderStylePopup;
- ::sfx2::sidebar::EnumContext maContext;
+ vcl::EnumContext maContext;
SfxBindings* mpBindings;
DECL_LINK_TYPED(TbxCellBorderSelectHdl, ToolBox*, void);
diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
index 15bc8a1aa5f0..1a70f32fa54b 100644
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
@@ -169,7 +169,7 @@ void NumberFormatPropertyPanel::DataChanged(
}
void NumberFormatPropertyPanel::HandleContextChange(
- const ::sfx2::sidebar::EnumContext& rContext)
+ const vcl::EnumContext& rContext)
{
if(maContext == rContext)
{
diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx
index c6b2c82ccdc3..7947cb7b0436 100644
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx
@@ -46,7 +46,7 @@ public:
const DataChangedEvent& rEvent) override;
virtual void HandleContextChange(
- const ::sfx2::sidebar::EnumContext& rContext) override;
+ const vcl::EnumContext& rContext) override;
virtual void NotifyItemUpdate(
const sal_uInt16 nSId,
@@ -78,7 +78,7 @@ private:
sal_Int32 mnCategorySelected;
- ::sfx2::sidebar::EnumContext maContext;
+ vcl::EnumContext maContext;
SfxBindings* mpBindings;
DECL_LINK_TYPED(NumFormatSelectHdl, ListBox&, void);
diff --git a/sc/source/ui/view/auditsh.cxx b/sc/source/ui/view/auditsh.cxx
index bba0b46db499..bc94dd09b286 100644
--- a/sc/source/ui/view/auditsh.cxx
+++ b/sc/source/ui/view/auditsh.cxx
@@ -23,7 +23,7 @@
#include <sfx2/objface.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/request.hxx>
-#include <sfx2/sidebar/EnumContext.hxx>
+#include <vcl/EnumContext.hxx>
#include "auditsh.hxx"
#include "tabvwsh.hxx"
@@ -56,7 +56,7 @@ ScAuditingShell::ScAuditingShell(ScViewData* pData) :
}
SetHelpId( HID_SCSHELL_AUDIT );
SetName("Auditing");
- SfxShell::SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_Auditing));
+ SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context_Auditing));
}
ScAuditingShell::~ScAuditingShell()
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index f609e15ed3fe..667c869be4f2 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -33,7 +33,7 @@
#include <sfx2/objface.hxx>
#include <sfx2/request.hxx>
#include <sfx2/viewfrm.hxx>
-#include <sfx2/sidebar/EnumContext.hxx>
+#include <vcl/EnumContext.hxx>
#include <svx/clipfmtitem.hxx>
#include <svx/sidebar/ContextChangeEventMultiplexer.hxx>
#include <editeng/langitem.hxx>
@@ -80,7 +80,7 @@ ScCellShell::ScCellShell(ScViewData* pData) :
{
SetHelpId(HID_SCSHELL_CELLSH);
SetName("Cell");
- SfxShell::SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_Cell));
+ SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context_Cell));
}
ScCellShell::~ScCellShell()
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index 864f1ab787e5..7953fc54d4d9 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -36,7 +36,7 @@
#include <editeng/flstitem.hxx>
#include <editeng/fontitem.hxx>
#include <svx/hlnkitem.hxx>
-#include <sfx2/sidebar/EnumContext.hxx>
+#include <vcl/EnumContext.hxx>
#include <editeng/postitem.hxx>
#include <editeng/scripttypeitem.hxx>
#include <editeng/shdditem.hxx>
@@ -99,7 +99,7 @@ ScEditShell::ScEditShell(EditView* pView, ScViewData* pData) :
SetPool( pEditView->GetEditEngine()->GetEmptyItemSet().GetPool() );
SetUndoManager( &pEditView->GetEditEngine()->GetUndoManager() );
SetName("EditCell");
- SfxShell::SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_EditCell));
+ SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context_EditCell));
}
ScEditShell::~ScEditShell()
diff --git a/sc/source/ui/view/pivotsh.cxx b/sc/source/ui/view/pivotsh.cxx
index b5c13839438a..13899b25eaaf 100644
--- a/sc/source/ui/view/pivotsh.cxx
+++ b/sc/source/ui/view/pivotsh.cxx
@@ -25,7 +25,7 @@
#include <sfx2/request.hxx>
#include <svl/whiter.hxx>
#include <vcl/msgbox.hxx>
-#include <sfx2/sidebar/EnumContext.hxx>
+#include <vcl/EnumContext.hxx>
#include "sc.hrc"
#include "pivotsh.hxx"
@@ -65,7 +65,7 @@ ScPivotShell::ScPivotShell( ScTabViewShell* pViewSh ) :
}
SetHelpId( HID_SCSHELL_PIVOTSH );
SetName("Pivot");
- SfxShell::SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_Pivot));
+ SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context_Pivot));
}
ScPivotShell::~ScPivotShell()
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index d1430303fb14..caa945a3ca80 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -214,7 +214,7 @@ void ScTabViewShell::Activate(bool bMDI)
ContextChangeEventMultiplexer::NotifyContextChange(
GetController(),
- ::sfx2::sidebar::EnumContext::Context_Default);
+ vcl::EnumContext::Context_Default);
}
void ScTabViewShell::Deactivate(bool bMDI)