svx/source/tbxctrls/tbxcolor.cxx | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
New commits:
commit a1fa83a56694e12471006d510d02cd80be0a2034
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Fri Dec 20 16:36:31 2019 +0200
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Sat Dec 21 05:03:08 2019 +0200
Get rid of two pointless #defines
Change-Id: I7479f4f1c440bba1dd9f922c4df32ab877e0a803
Reviewed-on: https://gerrit.libreoffice.org/85619
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Tor Lillqvist <t...@collabora.com>
(cherry picked from commit 83fedc02f2d831774c12d60097a99e968b56dc5e)
diff --git a/svx/source/tbxctrls/tbxcolor.cxx b/svx/source/tbxctrls/tbxcolor.cxx
index 5336f070aadf..3a17e38820a4 100644
--- a/svx/source/tbxctrls/tbxcolor.cxx
+++ b/svx/source/tbxctrls/tbxcolor.cxx
@@ -34,11 +34,8 @@ namespace svx
using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::beans;
- #define TOOLBAR_RESNAME "private:resource/toolbar/"
- #define PROPNAME_LAYOUTMANAGER "LayoutManager"
-
ToolboxAccess::ToolboxAccess( const OUString& rToolboxName ) :
- m_sToolboxResName ( TOOLBAR_RESNAME )
+ m_sToolboxResName ( "private:resource/toolbar/" )
{
m_sToolboxResName += rToolboxName;
@@ -50,7 +47,7 @@ namespace svx
Reference< XFrame > xFrame =
SfxViewFrame::Current()->GetFrame().GetFrameInterface();
Reference< XPropertySet > xFrameProps( xFrame, UNO_QUERY );
if ( xFrameProps.is() )
- xFrameProps->getPropertyValue( PROPNAME_LAYOUTMANAGER )
>>= m_xLayouter;
+ xFrameProps->getPropertyValue( "LayoutManager" ) >>=
m_xLayouter;
}
catch ( Exception const & )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
