diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2016-03-30 10:40:02 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2016-03-30 11:01:31 +0200 |
| commit | 97efceb163ab77bbae90773940a169ee2849b447 (patch) | |
| tree | 47d79e392bd206ad03644657bb21fd83ec01b833 | |
| parent | d150cc71a37f11c6e47cc528a74782722bff048c (diff) | |
notebookbar: Move the proof-of-concept notebookbar from vcl to sw.
Change-Id: I58b79c433e208ab4451c2e76af7604cfe254c1d0
| -rw-r--r-- | sw/UIConfig_swriter.mk | 1 | ||||
| -rw-r--r-- | sw/source/uibase/app/docsh.cxx | 2 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/notebookbar.ui (renamed from vcl/uiconfig/ui/notebookbar.ui) | 0 | ||||
| -rw-r--r-- | vcl/UIConfig_vcl.mk | 1 |
4 files changed, 2 insertions, 2 deletions
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk index 1c90ba07666a..f1e5dc81046a 100644 --- a/sw/UIConfig_swriter.mk +++ b/sw/UIConfig_swriter.mk @@ -202,6 +202,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\ sw/uiconfig/swriter/ui/mmselectpage \ sw/uiconfig/swriter/ui/mmsendmails \ sw/uiconfig/swriter/ui/mmsalutationpage \ + sw/uiconfig/swriter/ui/notebookbar \ sw/uiconfig/swriter/ui/paradialog \ sw/uiconfig/swriter/ui/picturedialog \ sw/uiconfig/swriter/ui/picturepage \ diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index 6a7db05c9fa1..d33e9f504f65 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -1074,7 +1074,7 @@ void SwDocShell::GetState(SfxItemSet& rSet) case SID_NOTEBOOKBAR: { SfxViewShell* pViewShell = GetView()? GetView(): SfxViewShell::Current(); - sfx2::SfxNotebookBar::StateMethod(pViewShell->GetViewFrame()->GetBindings(), "vcl/ui/notebookbar.ui"); + sfx2::SfxNotebookBar::StateMethod(pViewShell->GetViewFrame()->GetBindings(), "modules/swriter/ui/notebookbar.ui"); } break; diff --git a/vcl/uiconfig/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui index 51d305a1a6e0..51d305a1a6e0 100644 --- a/vcl/uiconfig/ui/notebookbar.ui +++ b/sw/uiconfig/swriter/ui/notebookbar.ui diff --git a/vcl/UIConfig_vcl.mk b/vcl/UIConfig_vcl.mk index f30252cd5868..a81b30ed497a 100644 --- a/vcl/UIConfig_vcl.mk +++ b/vcl/UIConfig_vcl.mk @@ -13,7 +13,6 @@ $(eval $(call gb_UIConfig_add_uifiles,vcl,\ vcl/uiconfig/ui/cupspassworddialog \ vcl/uiconfig/ui/errornocontentdialog \ vcl/uiconfig/ui/errornoprinterdialog \ - vcl/uiconfig/ui/notebookbar \ vcl/uiconfig/ui/printdialog \ vcl/uiconfig/ui/printerdevicepage \ vcl/uiconfig/ui/printerpaperpage \ |