de-src empty panel placeholder widgetry

Change-Id: I99a292cd76f40159f12cb98b362559e4109121c3

5 files changed, 11 insertions, 69 deletions

diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk
index c56a5cea95e2..3a987344f040 100644
--- a/svx/AllLangResTarget_svx.mk
+++ b/svx/AllLangResTarget_svx.mk
@@ -66,7 +66,6 @@ $(eval $(call gb_SrsTarget_add_files,svx/res,\
     svx/source/form/fmstring.src \
     svx/source/items/svxerr.src \
     svx/source/items/svxitems.src \
-    svx/source/sidebar/EmptyPanel.src \
     svx/source/sidebar/area/AreaPropertyPanel.src \
     svx/source/sidebar/line/LinePropertyPanel.src \
     svx/source/sidebar/paragraph/ParaPropertyPanel.src \
diff --git a/svx/source/sidebar/EmptyPanel.cxx b/svx/source/sidebar/EmptyPanel.cxx
index e436ba894ac3..00579c3ca1f9 100644
--- a/svx/source/sidebar/EmptyPanel.cxx
+++ b/svx/source/sidebar/EmptyPanel.cxx
@@ -18,23 +18,19 @@
  */
 
 #include "EmptyPanel.hxx"
-#include "EmptyPanel.hrc"
 #include "svx/dialogs.hrc"
 #include "svx/dialmgr.hxx"
 
-
 namespace svx { namespace sidebar {
 
 EmptyPanel::EmptyPanel (vcl::Window* pParent)
-    : Control(pParent, SVX_RES(RID_SIDEBAR_EMPTY_PANEL)),
-      maMessageControl(VclPtr<FixedText>::Create(this, SVX_RES(FT_MESSAGE)))
+    : Control(pParent)
+    , maMessageControl(VclPtr<FixedText>::Create(this))
 {
-    maMessageControl->setPosSizePixel(5,5, 250,15);
-    maMessageControl->SetStyle(WB_WORDBREAK);// | WB_NOMNEMONICS);
-    //maMessageControl.GetStyle()
-    //        & ~(WB_NOMULTILINE | WB_PATHELLIPSIS)
-    //        | WB_WORDBREAK | WB_NOMNEMONICS);
-    FreeResource();
+    maMessageControl->SetText(SVX_RES(RID_SIDEBAR_EMPTY_PANEL_TEXT));
+    maMessageControl->setPosSizePixel(5, 5, 250, 15);
+    maMessageControl->SetStyle(WB_WORDBREAK);
+    maMessageControl->Show();
 
     SetBackground(Wallpaper());
 
@@ -42,7 +38,6 @@ EmptyPanel::EmptyPanel (vcl::Window* pParent)
     Show();
 }
 
-
 EmptyPanel::~EmptyPanel()
 {
     disposeOnce();
diff --git a/svx/source/sidebar/EmptyPanel.hrc b/svx/source/sidebar/EmptyPanel.hrc
deleted file mode 100644
index 26f5defff662..000000000000
--- a/svx/source/sidebar/EmptyPanel.hrc
+++ /dev/null
@@ -1,25 +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 .
- */
-#include <svx/dialogs.hrc>
-
-// For RID_SIDEBAR_EMPTY_PANEL
-
-#define FT_MESSAGE 1
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sidebar/EmptyPanel.src b/svx/source/sidebar/EmptyPanel.src
deleted file mode 100644
index 2611a6b05689..000000000000
--- a/svx/source/sidebar/EmptyPanel.src
+++ /dev/null
@@ -1,32 +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 .
- */
-#include "EmptyPanel.hrc"
-#include <svx/dialogs.hrc>
-
-Control RID_SIDEBAR_EMPTY_PANEL
-{
-    FixedText FT_MESSAGE
-    {
-        Pos = MAP_APPFONT(2,2);
-        Size = MAP_APPFONT(100,24);
-        Text [en-US] = "Properties for the task that you are performing are not available for the current selection";
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src
index bc0d33267e07..259bc8ee1af1 100644
--- a/svx/source/stbctrls/stbctrls.src
+++ b/svx/source/stbctrls/stbctrls.src
@@ -181,6 +181,11 @@ String RID_SVXSTR_ZOOM_OPTIMAL_VIEW
     Text [ en-US ] = "Optimal View" ;
 };
 
+String RID_SIDEBAR_EMPTY_PANEL_TEXT
+{
+    Text [ en-US ] = "Properties for the task that you are performing are not available for the current selection" ;
+};
+
  // PopupMenu -------------------------------------------------------------
 Menu RID_SVXMNU_ZOOM
 {