include/sfx2/sidebar/IContextChangeReceiver.hxx | 7 ++--
include/sfx2/sidebar/ILayoutableWindow.hxx | 5 ++-
include/sfx2/sidebar/SidebarPanelBase.hxx | 3 +-
sc/source/ui/sidebar/AlignmentPropertyPanel.hxx | 1
sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx | 1
sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx | 1
sfx2/Library_sfx.mk | 2 +
sfx2/source/sidebar/AsynchronousCall.cxx | 2 -
sfx2/source/sidebar/IContextChangeReceiver.cxx | 28 +++++++++++++++++++
sfx2/source/sidebar/ILayoutableWindow.cxx | 28 +++++++++++++++++++
sfx2/source/sidebar/SidebarPanelBase.cxx | 8 -----
11 files changed, 68 insertions(+), 18 deletions(-)
New commits:
commit 43d022d31ac774837273e35f8a1d738efd811de1
Author: Andre Fischer <a...@apache.org>
Date: Mon May 13 07:40:20 2013 +0000
Related: #i122047# Added missing implementation of virtual destructors
(cherry picked from commit 107eb08386046f1e78dc32b21f569c6aa7352cd1)
Change-Id: Icc57d8910a390e9b608b5aa4a0fa6d8c8659208d
diff --git a/sfx2/source/sidebar/AsynchronousCall.cxx
b/sfx2/source/sidebar/AsynchronousCall.cxx
index 54f5883..a4b85bd 100644
--- a/sfx2/source/sidebar/AsynchronousCall.cxx
+++ b/sfx2/source/sidebar/AsynchronousCall.cxx
@@ -66,7 +66,7 @@ void AsynchronousCall::CancelRequest (void)
if (mnCallId != 0)
{
Application::RemoveUserEvent(mnCallId);
- mnCallId = -1;
+ mnCallId = 0;
}
}
diff --git a/sfx2/source/sidebar/IContextChangeReceiver.cxx
b/sfx2/source/sidebar/IContextChangeReceiver.cxx
new file mode 100644
index 0000000..1aa7a50
--- /dev/null
+++ b/sfx2/source/sidebar/IContextChangeReceiver.cxx
@@ -0,0 +1,28 @@
+/*
+ * 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/sidebar/IContextChangeReceiver.hxx>
+
+
+namespace sfx2 { namespace sidebar {
+
+
+IContextChangeReceiver::~IContextChangeReceiver (void)
+{
+}
+
+} } // end of namespace ::sd::sidebar
diff --git a/sfx2/source/sidebar/ILayoutableWindow.cxx
b/sfx2/source/sidebar/ILayoutableWindow.cxx
new file mode 100644
index 0000000..dccd15d
--- /dev/null
+++ b/sfx2/source/sidebar/ILayoutableWindow.cxx
@@ -0,0 +1,28 @@
+/*
+ * 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/sidebar/ILayoutableWindow.hxx>
+
+
+namespace sfx2 { namespace sidebar {
+
+
+ILayoutableWindow::~ILayoutableWindow (void)
+{
+}
+
+} } // end of namespace ::sd::sidebar
diff --git a/sfx2/source/sidebar/SidebarPanelBase.cxx
b/sfx2/source/sidebar/SidebarPanelBase.cxx
index 6a17fb7..9aef9fa 100644
--- a/sfx2/source/sidebar/SidebarPanelBase.cxx
+++ b/sfx2/source/sidebar/SidebarPanelBase.cxx
@@ -240,12 +240,4 @@ ui::LayoutSize SAL_CALL
SidebarPanelBase::getHeightForWidth (const sal_Int32 nWi
return ui::LayoutSize(0,0,0);
}
-IContextChangeReceiver::~IContextChangeReceiver()
-{
-}
-
-ILayoutableWindow::~ILayoutableWindow()
-{
-}
-
} } // end of namespace sfx2::sidebar
commit decee367674661cf2535c0b8686eb9cec8658c09
Author: Andre Fischer <a...@apache.org>
Date: Fri May 10 11:03:45 2013 +0000
Resolves: #i122047# Adding virtual destructors to interfaces...
to prevent problems with older compilers
(cherry picked from commit 8f3625e6cf098c3fd5e6701b7b687a0423d78f51)
Conflicts:
sfx2/inc/sfx2/sidebar/IContextChangeReceiver.hxx
sfx2/inc/sfx2/sidebar/ILayoutableWindow.hxx
sfx2/inc/sfx2/sidebar/SidebarPanelBase.hxx
Change-Id: I2bf548fd7ff16db58938273bc4b60ad83325b376
diff --git a/include/sfx2/sidebar/IContextChangeReceiver.hxx
b/include/sfx2/sidebar/IContextChangeReceiver.hxx
index 2b9d57c..64d9e66 100644
--- a/include/sfx2/sidebar/IContextChangeReceiver.hxx
+++ b/include/sfx2/sidebar/IContextChangeReceiver.hxx
@@ -19,6 +19,7 @@
#define SFX_SIDEBAR_CONTEXT_CHANGE_RECEIVER_INTERFACE_HXX
#include "EnumContext.hxx"
+#include "sfx2/dllapi.h"
namespace sfx2 { namespace sidebar {
@@ -27,9 +28,9 @@ namespace sfx2 { namespace sidebar {
class SFX2_DLLPUBLIC IContextChangeReceiver
{
public:
- virtual void HandleContextChange (
- const EnumContext aContext) = 0;
- virtual ~IContextChangeReceiver();
+ virtual ~IContextChangeReceiver ();
+
+ virtual void HandleContextChange (const EnumContext aContext) = 0;
};
} } // end of namespace ::sd::sidebar
diff --git a/include/sfx2/sidebar/ILayoutableWindow.hxx
b/include/sfx2/sidebar/ILayoutableWindow.hxx
index 8dc6745..4987237 100644
--- a/include/sfx2/sidebar/ILayoutableWindow.hxx
+++ b/include/sfx2/sidebar/ILayoutableWindow.hxx
@@ -18,9 +18,9 @@
#ifndef SFX_SIDEBAR_LAYOUTABLE_WINDOW_INTERFACE_HXX
#define SFX_SIDEBAR_LAYOUTABLE_WINDOW_INTERFACE_HXX
+#include "sfx2/dllapi.h"
#include <tools/gen.hxx>
#include <sal/types.h>
-#include <sfx2/dllapi.h>
#include <com/sun/star/ui/LayoutSize.hpp>
class Window;
@@ -31,11 +31,12 @@ namespace sfx2 { namespace sidebar {
class SFX2_DLLPUBLIC ILayoutableWindow
{
public:
+ virtual ~ILayoutableWindow();
+
/** Return the preferred height with the constraint, that the
window will be set to the given width.
*/
virtual ::com::sun::star::ui::LayoutSize GetHeightForWidth (const
sal_Int32 nWidth) = 0;
- virtual ~ILayoutableWindow();
};
diff --git a/include/sfx2/sidebar/SidebarPanelBase.hxx
b/include/sfx2/sidebar/SidebarPanelBase.hxx
index 7117505..330533a 100644
--- a/include/sfx2/sidebar/SidebarPanelBase.hxx
+++ b/include/sfx2/sidebar/SidebarPanelBase.hxx
@@ -19,6 +19,7 @@
#define SFX_SIDEBAR_PANEL_BASE_HXX
#include "EnumContext.hxx"
+#include "IContextChangeReceiver.hxx"
#include <cppuhelper/compbase4.hxx>
#include <cppuhelper/basemutex.hxx>
@@ -63,7 +64,7 @@ public:
static cssu::Reference<css::ui::XUIElement> Create (
const ::rtl::OUString& rsResourceURL,
const cssu::Reference<css::frame::XFrame>& rxFrame,
- Window* mpWindow,
+ Window* pControl,
const css::ui::LayoutSize& rLayoutSize);
// XContextChangeEventListener
diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx
b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx
index a5a0a58..13742aa 100644
--- a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx
+++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx
@@ -18,7 +18,6 @@
#ifndef SC_PROPERTYPANEL_ALIGNMENT_HXX
#define SC_PROPERTYPANEL_ALIGNMENT_HXX
-#include <sfx2/sidebar/SidebarPanelBase.hxx>
#include <sfx2/sidebar/ControllerItem.hxx>
#include <sfx2/sidebar/IContextChangeReceiver.hxx>
#include <vcl/fixed.hxx>
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
index 00b747e..30efdca 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
@@ -18,7 +18,6 @@
#ifndef SC_PROPERTYPANEL_APPEARANCE_HXX
#define SC_PROPERTYPANEL_APPEARANCE_HXX
-#include <sfx2/sidebar/SidebarPanelBase.hxx>
#include <sfx2/sidebar/ControllerItem.hxx>
#include <sfx2/sidebar/IContextChangeReceiver.hxx>
#include <boost/scoped_ptr.hpp>
diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx
b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx
index 8fc3f02..0d1efe6 100644
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx
@@ -18,7 +18,6 @@
#ifndef SC_PROPERTYPANEL_NUMFORMAT_HXX
#define SC_PROPERTYPANEL_NUMFORMAT_HXX
-#include <sfx2/sidebar/SidebarPanelBase.hxx>
#include <sfx2/sidebar/ControllerItem.hxx>
#include <sfx2/sidebar/IContextChangeReceiver.hxx>
#include <boost/scoped_ptr.hpp>
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index e1afd95..a55c3c1 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -249,6 +249,8 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
sfx2/source/sidebar/EnumContext \
sfx2/source/sidebar/FocusManager \
sfx2/source/sidebar/MenuButton \
+ sfx2/source/sidebar/IContextChangeReceiver \
+ sfx2/source/sidebar/ILayoutableWindow \
sfx2/source/sidebar/Paint \
sfx2/source/sidebar/Panel \
sfx2/source/sidebar/PanelDescriptor \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
