we don't need the code, but we need the images in the src file

apparently so they can be found at postprocess time and
inserted into the image zips for the use of the pngs by
other consumers

Change-Id: Ib45834da69462109fdf7502176a6f4721057d980

7 files changed, 83 insertions, 25 deletions

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/sfx2/source/sidebar/Sidebar.hrc b/sfx2/source/sidebar/Sidebar.hrc
new file mode 100644
index 000000000000..79d5a81554e5
--- /dev/null
+++ b/sfx2/source/sidebar/Sidebar.hrc
@@ -0,0 +1,60 @@
+/* -*- 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 .
+ */
+#include <sfx2/sfx.hrc>
+
+#define RID_SIDEBAR_RESOURCE  (RID_SFX_SIDEBAR_START +  0)
+
+#define IMAGE_SIDEBAR_PLUS                        1
+#define IMAGE_SIDEBAR_MINUS                       3
+#define IMAGE_SIDEBAR_GRIP                        5
+#define IMAGE_SIDEBAR_MENU                        7
+#define IMAGE_SIDEBAR_DETAIL_DIALOG               9
+#define IMAGE_SIDEBAR_DECK_3D_LARGE              20
+#define IMAGE_SIDEBAR_DECK_3D_SMALL              22
+#define IMAGE_SIDEBAR_DECK_ANIMATION_LARGE       30
+#define IMAGE_SIDEBAR_DECK_ANIMATION_SMALL       32
+#define IMAGE_SIDEBAR_DECK_COLORS_LARGE          40
+#define IMAGE_SIDEBAR_DECK_COLORS_SMALL          42
+#define IMAGE_SIDEBAR_DECK_EYEDROPPER_LARGE      50
+#define IMAGE_SIDEBAR_DECK_EYEDROPPER_SMALL      52
+#define IMAGE_SIDEBAR_DECK_GALLERY_LARGE         60
+#define IMAGE_SIDEBAR_DECK_GALLERY_SMALL         62
+#define IMAGE_SIDEBAR_DECK_IMGANIM_LARGE         70
+#define IMAGE_SIDEBAR_DECK_IMGANIM_SMALL         72
+#define IMAGE_SIDEBAR_DECK_NAVIGATOR_LARGE       80
+#define IMAGE_SIDEBAR_DECK_NAVIGATOR_SMALL       82
+#define IMAGE_SIDEBAR_PROPERTIES_DECK_LARGE      90
+#define IMAGE_SIDEBAR_PROPERTIES_DECK_SMALL      92
+#define IMAGE_SIDEBAR_DECK_STYLE_LARGE          100
+#define IMAGE_SIDEBAR_DECK_STYLE_SMALL          102
+#define IMAGE_SIDEBAR_DECK_TEMPLATE_LARGE       110
+#define IMAGE_SIDEBAR_DECK_TEMPLATE_SMALL       112
+#define IMAGE_SIDEBAR_DECK_TRANSITION_LARGE     120
+#define IMAGE_SIDEBAR_DECK_TRANSITION_SMALL     122
+#define IMAGE_SIDEBAR_DECK_FUNCTIONS_LARGE      130
+#define IMAGE_SIDEBAR_DECK_FUNCTIONS_SMALL      132
+
+#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());