summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/sfx2/sidebar/SidebarResource.hxx35
-rw-r--r--sfx2/source/sidebar/DeckTitleBar.cxx2
-rw-r--r--sfx2/source/sidebar/PanelTitleBar.cxx2
-rw-r--r--sfx2/source/sidebar/Sidebar.hrc (renamed from include/sfx2/sidebar/Sidebar.hrc)12
-rw-r--r--sfx2/source/sidebar/Sidebar.src29
-rw-r--r--sfx2/source/sidebar/SidebarController.cxx10
-rw-r--r--sfx2/source/sidebar/TabBar.cxx2
-rw-r--r--sfx2/source/sidebar/Theme.cxx3
8 files changed, 29 insertions, 66 deletions
diff --git a/include/sfx2/sidebar/SidebarResource.hxx b/include/sfx2/sidebar/SidebarResource.hxx
deleted file mode 100644
index 78ce96b2b4ea..000000000000
--- a/include/sfx2/sidebar/SidebarResource.hxx
+++ /dev/null
@@ -1,35 +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_SFX2_SOURCE_SIDEBAR_SIDEBARRESOURCE_HXX
-#define INCLUDED_SFX2_SOURCE_SIDEBAR_SIDEBARRESOURCE_HXX
-
-#include <sfx2/sidebar/Sidebar.hrc>
-#include <sfx2/sfxresid.hxx>
-#include <tools/rc.hxx>
-
-class SidebarResource : public Resource
-{
-public:
- SidebarResource() : Resource(SfxResId(RID_SIDEBAR_RESOURCE)){}
- ~SidebarResource() { FreeResource(); }
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/DeckTitleBar.cxx b/sfx2/source/sidebar/DeckTitleBar.cxx
index 22ddec13eb1b..29067d1a02df 100644
--- a/sfx2/source/sidebar/DeckTitleBar.cxx
+++ b/sfx2/source/sidebar/DeckTitleBar.cxx
@@ -21,7 +21,7 @@
#include <sfx2/sidebar/Theme.hxx>
#include <sfx2/sfxresid.hxx>
-#include <sfx2/sidebar/Sidebar.hrc>
+#include "Sidebar.hrc"
#include <vcl/image.hxx>
diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx b/sfx2/source/sidebar/PanelTitleBar.cxx
index 7a16f337e102..d13dc740a93f 100644
--- a/sfx2/source/sidebar/PanelTitleBar.cxx
+++ b/sfx2/source/sidebar/PanelTitleBar.cxx
@@ -20,7 +20,7 @@
#include <sfx2/sidebar/PanelTitleBar.hxx>
#include <sfx2/sfxresid.hxx>
-#include <sfx2/sidebar/Sidebar.hrc>
+#include "Sidebar.hrc"
#include <sfx2/sidebar/Paint.hxx>
#include <sfx2/sidebar/Panel.hxx>
diff --git a/include/sfx2/sidebar/Sidebar.hrc b/sfx2/source/sidebar/Sidebar.hrc
index 96597cfebfec..79d5a81554e5 100644
--- a/include/sfx2/sidebar/Sidebar.hrc
+++ b/sfx2/source/sidebar/Sidebar.hrc
@@ -49,12 +49,12 @@
#define IMAGE_SIDEBAR_DECK_TRANSITION_SMALL 122
#define IMAGE_SIDEBAR_DECK_FUNCTIONS_LARGE 130
#define IMAGE_SIDEBAR_DECK_FUNCTIONS_SMALL 132
-#define STRING_CUSTOMIZATION 200
-#define STRING_RESTORE 201
-#define STRING_HIDE_SIDEBAR 202
-#define SFX_STR_SIDEBAR_MORE_OPTIONS (RID_SFX_SIDEBAR_START + 1)
-#define SFX_STR_SIDEBAR_CLOSE_DECK (RID_SFX_SIDEBAR_START + 2)
-#define SFX_STR_SIDEBAR_SETTINGS (RID_SFX_SIDEBAR_START + 3)
+#define SFX_STR_SIDEBAR_MORE_OPTIONS (RID_SFX_SIDEBAR_START + 1)
+#define SFX_STR_SIDEBAR_CLOSE_DECK (RID_SFX_SIDEBAR_START + 2)
+#define SFX_STR_SIDEBAR_SETTINGS (RID_SFX_SIDEBAR_START + 3)
+#define SFX_STR_SIDEBAR_CUSTOMIZATION (RID_SFX_SIDEBAR_START + 4)
+#define SFX_STR_SIDEBAR_RESTORE (RID_SFX_SIDEBAR_START + 5)
+#define SFX_STR_SIDEBAR_HIDE_SIDEBAR (RID_SFX_SIDEBAR_START + 6)
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/Sidebar.src b/sfx2/source/sidebar/Sidebar.src
index 232030747f76..9179a2fb4de1 100644
--- a/sfx2/source/sidebar/Sidebar.src
+++ b/sfx2/source/sidebar/Sidebar.src
@@ -16,7 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <sfx2/sidebar/Sidebar.hrc>
+#include "Sidebar.hrc"
Resource RID_SIDEBAR_RESOURCE
{
@@ -141,18 +141,6 @@ Resource RID_SIDEBAR_RESOURCE
{
ImageBitmap = Bitmap { File = "symphony/sidebar-functions-small.png" ;};
};
- String STRING_CUSTOMIZATION
- {
- Text [en-US] = "Customization";
- };
- String STRING_RESTORE
- {
- Text [en-US] = "Restore Default";
- };
- String STRING_HIDE_SIDEBAR
- {
- Text [en-US] = "Close Sidebar";
- };
};
String SFX_STR_SIDEBAR_MORE_OPTIONS
@@ -170,4 +158,19 @@ String SFX_STR_SIDEBAR_SETTINGS
Text [en-US] = "Sidebar Settings";
};
+String SFX_STR_SIDEBAR_CUSTOMIZATION
+{
+ Text [en-US] = "Customization";
+};
+
+String SFX_STR_SIDEBAR_RESTORE
+{
+ Text [en-US] = "Restore Default";
+};
+
+String SFX_STR_SIDEBAR_HIDE_SIDEBAR
+{
+ Text [en-US] = "Close Sidebar";
+};
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 56e888851929..71d8592c7062 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -21,7 +21,6 @@
#include <sfx2/sidebar/DeckTitleBar.hxx>
#include <sfx2/sidebar/Panel.hxx>
#include <sfx2/sidebar/PanelTitleBar.hxx>
-#include <sfx2/sidebar/SidebarResource.hxx>
#include <sfx2/sidebar/TabBar.hxx>
#include <sfx2/sidebar/Theme.hxx>
#include <sfx2/sidebar/SidebarChildWindow.hxx>
@@ -35,6 +34,7 @@
#include <sfx2/sfxsids.hrc>
#include <sfx2/titledockwin.hxx>
#include "sfxlocal.hrc"
+#include "Sidebar.hrc"
#include <framework/ContextChangeEventMultiplexerTunnel.hxx>
#include <vcl/floatwin.hxx>
#include <vcl/fixed.hxx>
@@ -943,8 +943,6 @@ VclPtr<PopupMenu> SidebarController::CreatePopupMenu (
// Create sub menu for customization (hiding of deck tabs.)
VclPtr<PopupMenu> pCustomizationMenu = VclPtr<PopupMenu>::Create();
- SidebarResource aLocalResource;
-
// Add one entry for every tool panel element to individually make
// them visible or hide them.
sal_Int32 nIndex (0);
@@ -981,11 +979,11 @@ VclPtr<PopupMenu> SidebarController::CreatePopupMenu (
else
pMenu->InsertItem(MID_UNLOCK_TASK_PANEL, SFX2_RESSTR(STR_SFX_UNDOCK));
- pMenu->InsertItem(MID_HIDE_SIDEBAR, SFX2_RESSTR(STRING_HIDE_SIDEBAR));
+ pMenu->InsertItem(MID_HIDE_SIDEBAR, SFX2_RESSTR(SFX_STR_SIDEBAR_HIDE_SIDEBAR));
pCustomizationMenu->InsertSeparator();
- pCustomizationMenu->InsertItem(MID_RESTORE_DEFAULT, SFX2_RESSTR(STRING_RESTORE));
+ pCustomizationMenu->InsertItem(MID_RESTORE_DEFAULT, SFX2_RESSTR(SFX_STR_SIDEBAR_RESTORE));
- pMenu->InsertItem(MID_CUSTOMIZATION, SFX2_RESSTR(STRING_CUSTOMIZATION));
+ pMenu->InsertItem(MID_CUSTOMIZATION, SFX2_RESSTR(SFX_STR_SIDEBAR_CUSTOMIZATION));
pMenu->SetPopupMenu(MID_CUSTOMIZATION, pCustomizationMenu);
pMenu->RemoveDisabledEntries(false);
diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index 0471cacf21e1..87777de05eb5 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -28,7 +28,7 @@
#include <sfx2/sidebar/SidebarController.hxx>
#include <sfx2/sfxresid.hxx>
-#include <sfx2/sidebar/Sidebar.hrc>
+#include "Sidebar.hrc"
#include <vcl/gradient.hxx>
#include <vcl/image.hxx>
diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index 68586272f408..b821f4f74d69 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -18,7 +18,6 @@
*/
#include <sfx2/sidebar/Theme.hxx>
#include <sfx2/sidebar/Paint.hxx>
-#include <sfx2/sidebar/SidebarResource.hxx>
#include <sfx2/sidebar/Tools.hxx>
#include <sfx2/app.hxx>
@@ -144,8 +143,6 @@ void Theme::InitializeTheme()
void Theme::UpdateTheme()
{
- SidebarResource aLocalResource;
-
try
{
const StyleSettings& rStyle (Application::GetSettings().GetStyleSettings());
generated by cgit (git 2.34.1) at 2024-08-15 14:14:01 +0000