Convert Alignment button to the generic controller

Change-Id: I76ead43fa1cfe7ba1b62d2b13c4f4d7658a9f290

2 files changed, 0 insertions, 106 deletions

diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index a890ed7b51fd..22216d627cc7 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -227,7 +227,6 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
     svx/source/tbxctrls/linectrl \
     svx/source/tbxctrls/tbunocontroller \
     svx/source/tbxctrls/tbunosearchcontrollers \
-    svx/source/tbxctrls/tbxalign \
     svx/source/tbxctrls/tbxcolor \
     svx/source/tbxctrls/tbxdrctl \
     svx/source/tbxctrls/verttexttbxctrl \
diff --git a/svx/source/tbxctrls/tbxalign.cxx b/svx/source/tbxctrls/tbxalign.cxx
deleted file mode 100644
index def2b2e2b00f..000000000000
--- a/svx/source/tbxctrls/tbxalign.cxx
+++ /dev/null
@@ -1,105 +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 <svl/aeitem.hxx>
-
-#include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
-
-#include "svx/tbxalign.hxx"
-#include <sfx2/imagemgr.hxx>
-#include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
-
-#include <sfx2/app.hxx>
-#include <vcl/toolbox.hxx>
-
-SFX_IMPL_TOOLBOX_CONTROL(SvxTbxCtlAlign, SfxAllEnumItem);
-
-/*
- * Klasse fuer SwToolbox
- */
-SvxTbxCtlAlign::SvxTbxCtlAlign( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
-    SfxToolBoxControl( nSlotId, nId, rTbx )
-    ,   m_aSubTbName( "alignmentbar" )
-    ,   m_aSubTbResName( "private:resource/toolbar/alignmentbar" )
-{
-    rTbx.SetItemBits( nId, ToolBoxItemBits::DROPDOWN | rTbx.GetItemBits( nId ) );
-    rTbx.Invalidate();
-
-    m_aCommand = m_aCommandURL;
-}
-
-/*
- * Hier wird das Fenster erzeugt
- * Lage der Toolbox mit GetToolBox() abfragbar
- * rItemRect sind die Screen-Koordinaten
- */
-
-VclPtr<SfxPopupWindow> SvxTbxCtlAlign::CreatePopupWindow()
-{
-    SolarMutexGuard aGuard;
-    if ( GetSlotId() == SID_OBJECT_ALIGN )
-        createAndPositionSubToolBar( m_aSubTbResName );
-    return NULL;
-}
-
-
-// XSubToolbarController
-
-
-sal_Bool SAL_CALL SvxTbxCtlAlign::opensSubToolbar() throw (::com::sun::star::uno::RuntimeException, std::exception)
-{
-    // We control a sub-toolbar therefore, we have to return true.
-    return sal_True;
-}
-
-OUString SAL_CALL SvxTbxCtlAlign::getSubToolbarName() throw (::com::sun::star::uno::RuntimeException, std::exception)
-{
-    // Provide the controlled sub-toolbar name, so we are notified whenever
-    // this toolbar executes a function.
-    SolarMutexGuard aGuard;
-    return m_aSubTbName;
-}
-
-void SAL_CALL SvxTbxCtlAlign::functionSelected( const OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException, std::exception)
-{
-    // remember the new command
-    m_aCommand = aCommand;
-
-    // Our sub-toolbar wants to execute a function.
-    // We have to change the image of our toolbar button to reflect the new function.
-    updateImage();
-}
-
-void SAL_CALL SvxTbxCtlAlign::updateImage() throw (::com::sun::star::uno::RuntimeException, std::exception)
-{
-    // We should update the button image of our parent (toolbar). Use the stored
-    // command to set the correct current image.
-    SolarMutexGuard aGuard;
-    if ( !m_aCommand.isEmpty() )
-    {
-        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame( getFrameInterface());
-        Image aImage = GetImage( xFrame, m_aCommand, hasBigImages() );
-        if ( !!aImage )
-            GetToolBox().SetItemImage( GetId(), aImage );
-    }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */