[Libreoffice-commits] core.git: include/svx svx/source

Stephan Bergmann sbergman at redhat.com
Tue May 6 04:08:45 PDT 2014


 include/svx/tbxdraw.hxx          |   66 ---------------------------------------
 svx/source/form/tbxform.cxx      |    1 
 svx/source/tbxctrls/tbxalign.cxx |    1 
 svx/source/tbxctrls/tbxdrctl.cxx |    1 
 4 files changed, 69 deletions(-)

New commits:
commit c748a17cac8be9e844ff920cf5c17b229847c316
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue May 6 13:08:07 2014 +0200

    Remove dead SvxPopupWindowTbxMgr definition
    
    Change-Id: I1d7221142b8f52672ea96cfe42e1e71c8e39c416

diff --git a/include/svx/tbxdraw.hxx b/include/svx/tbxdraw.hxx
deleted file mode 100644
index 37862f6..0000000
--- a/include/svx/tbxdraw.hxx
+++ /dev/null
@@ -1,66 +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 .
- */
-#ifndef INCLUDED_SVX_TBXDRAW_HXX
-#define INCLUDED_SVX_TBXDRAW_HXX
-
-#include <sfx2/tbxctrl.hxx>
-
-// class SvxPopupWindowTbxMgr --------------------------------------------
-
-class SvxPopupWindowTbxMgr : public SfxPopupWindow
-{
-    void*               pNiemalsDenPointerAufDieErzeugendeToolBoxMerken; // MI!
-    ResId               aRIdWinTemp;
-    ResId               aRIdTbxTemp;
-
-    Link                aTbxClickHdl;
-
-
-    DECL_LINK( TbxSelectHdl, ToolBox*);
-    DECL_LINK( TbxClickHdl, ToolBox*);
-
-protected:
-    using SfxPopupWindow::StateChanged;
-
-public:
-    SvxPopupWindowTbxMgr(   sal_uInt16 nId,
-                            SfxToolBoxControl* pTbxCtl,
-                            ResId aRIdWin,
-                            ResId aRIdTbx );
-    SvxPopupWindowTbxMgr(   sal_uInt16 nId,
-                            WindowAlign eAlign,
-                            ResId aRIdWin,
-                            ResId aRIdTbx );
-    virtual ~SvxPopupWindowTbxMgr();
-
-    virtual void                StateChanged( sal_uInt16 nSID, SfxItemState eState,
-                                              const SfxPoolItem* pState) SAL_OVERRIDE;
-    virtual SfxPopupWindow*     Clone() const SAL_OVERRIDE;
-    virtual void                PopupModeEnd() SAL_OVERRIDE;
-
-    void                        StartSelection();
-
-    // toolbox click or execute may chage the default selection in the tools toolbox
-    virtual void                UserEvent( sal_uIntPtr nEvent, void* pEventData ) SAL_OVERRIDE;
-};
-
-
-#endif      // _TBX_DRAW_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index a35b82d..5f8eeb7 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -33,7 +33,6 @@
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
 #include "svx/tbxctl.hxx"
-#include "svx/tbxdraw.hxx"
 #include "tbxform.hxx"
 #include "svx/fmresids.hrc"
 #include "fmhelp.hrc"
diff --git a/svx/source/tbxctrls/tbxalign.cxx b/svx/source/tbxctrls/tbxalign.cxx
index 6227566..aed1aa4 100644
--- a/svx/source/tbxctrls/tbxalign.cxx
+++ b/svx/source/tbxctrls/tbxalign.cxx
@@ -23,7 +23,6 @@
 #include <svx/dialogs.hrc>
 
 #include "svx/tbxalign.hxx"
-#include "svx/tbxdraw.hxx"
 #include <tools/shl.hxx>
 #include <sfx2/imagemgr.hxx>
 #include <vcl/svapp.hxx>
diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx
index 753b782..312aeb8 100644
--- a/svx/source/tbxctrls/tbxdrctl.cxx
+++ b/svx/source/tbxctrls/tbxdrctl.cxx
@@ -32,7 +32,6 @@
 #include <svx/dialogs.hrc>
 
 #include "svx/tbxctl.hxx"
-#include "svx/tbxdraw.hxx"
 #include "svx/tbxcolor.hxx"
 #include <com/sun/star/frame/XLayoutManager.hpp>
 


More information about the Libreoffice-commits mailing list