[Libreoffice-commits] core.git: 2 commits - comphelper/Library_comphelper.mk comphelper/source extensions/source extensions/uiconfig extensions/UIConfig_sabpilot.mk include/comphelper sc/Library_sc.mk sc/source unusedcode.easy
Caolán McNamara
caolanm at redhat.com
Fri May 9 01:28:40 PDT 2014
comphelper/Library_comphelper.mk | 1
comphelper/source/misc/ihwrapnofilter.cxx | 112 ---------
extensions/UIConfig_sabpilot.mk | 1
extensions/source/abpilot/abpresid.hrc | 16 -
extensions/source/abpilot/abspilot.src | 35 --
extensions/source/abpilot/admininvokationpage.cxx | 33 --
extensions/source/abpilot/admininvokationpage.hxx | 9
extensions/uiconfig/sabpilot/ui/invokeadminpage.ui | 63 +++++
include/comphelper/ihwrapnofilter.hxx | 78 ------
sc/Library_sc.mk | 1
sc/source/ui/drawfunc/fumark.cxx | 258 ---------------------
sc/source/ui/inc/fumark.hxx | 57 ----
sc/source/ui/view/tabvwsh2.cxx | 1
unusedcode.easy | 33 +-
14 files changed, 89 insertions(+), 609 deletions(-)
New commits:
commit 8a4a9c8876c8de0bfcf9d5a8fec30d45b63a84db
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri May 9 09:21:45 2014 +0100
convert invoke admin page to .ui
Change-Id: I63eda1792b5bc749dd01a85732cac6047be1a522
diff --git a/extensions/UIConfig_sabpilot.mk b/extensions/UIConfig_sabpilot.mk
index a52e50e..5623c5e 100644
--- a/extensions/UIConfig_sabpilot.mk
+++ b/extensions/UIConfig_sabpilot.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_UIConfig_UIConfig,modules/sabpilot))
$(eval $(call gb_UIConfig_add_uifiles,modules/sabpilot,\
extensions/uiconfig/sabpilot/ui/datasourcepage \
extensions/uiconfig/sabpilot/ui/fieldassignpage \
+ extensions/uiconfig/sabpilot/ui/invokeadminpage \
extensions/uiconfig/sabpilot/ui/selecttablepage \
extensions/uiconfig/sabpilot/ui/selecttypepage \
))
diff --git a/extensions/source/abpilot/abpresid.hrc b/extensions/source/abpilot/abpresid.hrc
index ae19767..d810755 100644
--- a/extensions/source/abpilot/abpresid.hrc
+++ b/extensions/source/abpilot/abpresid.hrc
@@ -41,15 +41,6 @@
#define RID_DIALOG_END RID_DLG_ADDRESSBOOKSOURCEPILOT
-
-// tab pages
-
-#define RID_PAGE_ADMININVOKATION ( RID_PAGE_START + 1 )
-// please adjust RID_PAGE_END (below) when adding new tab pages
-
-#define RID_PAGE_END RID_PAGE_ADMININVOKATION
-
-
// strings
#define RID_STR_DEFAULT_NAME ( RID_STRING_START + 0 )
@@ -103,9 +94,6 @@
#if RID_DIALOG_END > RID_ABP_END
#error "please adjust the resource id ranges!!"
#endif
-#if RID_PAGE_END > RID_ABP_END
- #error "please adjust the resource id ranges!!"
-#endif
#if RID_STRING_END > RID_ABP_END
#error "please adjust the resource id ranges!!"
#endif
@@ -126,11 +114,7 @@
// local resource ids
#define FL_SEPARATOR 1
-#define FT_ADMINEXPLANATION 3
#define FT_NAME_EXPL 4
-#define FT_ERROR 5
-
-#define PB_INVOKE_ADMIN_DIALOG 1
#define STR_SELECT_ABTYPE 1
#define STR_INVOKE_ADMIN_DIALOG 2
diff --git a/extensions/source/abpilot/abspilot.src b/extensions/source/abpilot/abspilot.src
index 04e700c..48f9c33 100644
--- a/extensions/source/abpilot/abspilot.src
+++ b/extensions/source/abpilot/abspilot.src
@@ -58,41 +58,6 @@ ModalDialog RID_DLG_ADDRESSBOOKSOURCEPILOT
};
};
-TabPage RID_PAGE_ADMININVOKATION
-{
- HelpID = "extensions:TabPage:RID_PAGE_ADMININVOKATION";
- SVLook = TRUE ;
- Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
-
- FixedText FT_ADMINEXPLANATION
- {
- Pos = MAP_APPFONT ( BORDER_X, 9 ) ;
- Size = MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 48 ) ;
- WordBreak = TRUE;
-
- Text [ en-US ] = "To set up the new data source, additional information is required.\n\nClick the following button to open another dialog in which you then enter the necessary information.";
- };
-
- PushButton PB_INVOKE_ADMIN_DIALOG
- {
- HelpID = "extensions:PushButton:RID_PAGE_ADMININVOKATION:PB_INVOKE_ADMIN_DIALOG";
- Pos = MAP_APPFONT ( ( WINDOW_SIZE_X - BUTTON_SIZE_X ) / 2, 60 ) ;
- Size = MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y ) ;
-
- Text [ en-US ] = "Settings";
- };
-
- FixedText FT_ERROR
- {
- Pos = MAP_APPFONT ( BORDER_X, WINDOW_SIZE_Y - HEADER_SIZE_Y - 7 - 48 ) ;
- Size = MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 48 ) ;
- WordBreak = TRUE;
- Hide = TRUE;
-
- Text [ en-US ] = "The connection to the data source could not be established.\nBefore you proceed, please check the settings made, or (on the previous page) choose another address data source type.";
- };
-};
-
ErrorBox RID_ERR_NEEDTYPESELECTION
{
Buttons = WB_OK;
diff --git a/extensions/source/abpilot/admininvokationpage.cxx b/extensions/source/abpilot/admininvokationpage.cxx
index b1e6a8f..a92e90d 100644
--- a/extensions/source/abpilot/admininvokationpage.cxx
+++ b/extensions/source/abpilot/admininvokationpage.cxx
@@ -22,49 +22,38 @@
#include "admininvokationimpl.hxx"
#include "comphelper/processfactory.hxx"
-
namespace abp
{
-
-
-
//= AdminDialogInvokationPage
-
AdminDialogInvokationPage::AdminDialogInvokationPage( OAddessBookSourcePilot* _pParent )
- :AddressBookSourcePage(_pParent, ModuleRes(RID_PAGE_ADMININVOKATION))
- ,m_aExplanation (this, ModuleRes(FT_ADMINEXPLANATION))
- ,m_aInvokeAdminDialog (this, ModuleRes(PB_INVOKE_ADMIN_DIALOG))
- ,m_aErrorMessage (this, ModuleRes(FT_ERROR))
- ,m_bSuccessfullyExecutedDialog(false)
+ : AddressBookSourcePage(_pParent, "InvokeAdminPage",
+ "modules/sabpilot/ui/invokeadminpage.ui")
+ , m_bSuccessfullyExecutedDialog(false)
{
- FreeResource();
-
- m_aInvokeAdminDialog.SetClickHdl( LINK(this, AdminDialogInvokationPage, OnInvokeAdminDialog) );
+ get(m_pInvokeAdminDialog, "settings");
+ get(m_pErrorMessage, "warning");
+ m_pInvokeAdminDialog->SetClickHdl( LINK(this, AdminDialogInvokationPage, OnInvokeAdminDialog) );
}
-
void AdminDialogInvokationPage::ActivatePage()
{
AddressBookSourcePage::ActivatePage();
- m_aInvokeAdminDialog.GrabFocus();
+ m_pInvokeAdminDialog->GrabFocus();
}
-
void AdminDialogInvokationPage::implUpdateErrorMessage()
{
const bool bIsConnected = getDialog()->getDataSource().isConnected();
- m_aErrorMessage.Show( !bIsConnected );
+ m_pErrorMessage->Show( !bIsConnected );
}
-
void AdminDialogInvokationPage::initializePage()
{
AddressBookSourcePage::initializePage();
- m_aErrorMessage.Hide();
+ m_pErrorMessage->Hide();
// if we're entering this page, we assume we had no connection trial with this data source
}
-
void AdminDialogInvokationPage::implTryConnect()
{
getDialog()->connectToDataSource( true );
@@ -80,13 +69,11 @@ namespace abp
getDialog()->travelNext();
}
-
bool AdminDialogInvokationPage::canAdvance() const
{
return AddressBookSourcePage::canAdvance() && getDialog()->getDataSource().isConnected();
}
-
IMPL_LINK( AdminDialogInvokationPage, OnInvokeAdminDialog, void*, /*NOTINTERESTEDIN*/ )
{
OAdminDialogInvokation aInvokation( getORB(), getDialog()->getDataSource().getDataSource(), getDialog() );
@@ -99,8 +86,6 @@ namespace abp
return 0L;
}
-
} // namespace abp
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/abpilot/admininvokationpage.hxx b/extensions/source/abpilot/admininvokationpage.hxx
index 8de6e52..4b26427 100644
--- a/extensions/source/abpilot/admininvokationpage.hxx
+++ b/extensions/source/abpilot/admininvokationpage.hxx
@@ -25,17 +25,12 @@
namespace abp
{
-
-
-
//= AdminDialogInvokationPage
-
class AdminDialogInvokationPage : public AddressBookSourcePage
{
protected:
- FixedText m_aExplanation;
- PushButton m_aInvokeAdminDialog;
- FixedText m_aErrorMessage;
+ PushButton* m_pInvokeAdminDialog;
+ FixedText* m_pErrorMessage;
bool m_bSuccessfullyExecutedDialog;
diff --git a/extensions/uiconfig/sabpilot/ui/invokeadminpage.ui b/extensions/uiconfig/sabpilot/ui/invokeadminpage.ui
new file mode 100644
index 0000000..868f250
--- /dev/null
+++ b/extensions/uiconfig/sabpilot/ui/invokeadminpage.ui
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
+<interface>
+ <requires lib="gtk+" version="3.0"/>
+ <object class="GtkGrid" id="InvokeAdminPage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="row_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes">To set up the new data source, additional information is required.
+
+Click the following button to open another dialog in which you then enter the necessary information.</property>
+ <property name="wrap">True</property>
+ <property name="max_width_chars">90</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="settings">
+ <property name="label" translatable="yes">Settings</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="halign">center</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="warning">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes">The connection to the data source could not be established.
+Before you proceed, please check the settings made, or (on the previous page) choose another address data source type.</property>
+ <property name="wrap">True</property>
+ <property name="max_width_chars">90</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+</interface>
commit 2510690866f9a1da677cae521ffc98c9b992239b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri May 9 09:06:19 2014 +0100
callcatcher: update unused code
Change-Id: I954a5dd88cb9ae9a2a36509507385e68b88f8cd5
diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk
index f2309f2..59fd36e 100644
--- a/comphelper/Library_comphelper.mk
+++ b/comphelper/Library_comphelper.mk
@@ -86,7 +86,6 @@ $(eval $(call gb_Library_add_exception_objects,comphelper,\
comphelper/source/misc/evtlistenerhlp \
comphelper/source/misc/evtmethodhelper \
comphelper/source/misc/expandmacro \
- comphelper/source/misc/ihwrapnofilter \
comphelper/source/misc/instancelocker \
comphelper/source/misc/interaction \
comphelper/source/misc/listenernotification \
diff --git a/comphelper/source/misc/ihwrapnofilter.cxx b/comphelper/source/misc/ihwrapnofilter.cxx
deleted file mode 100644
index b6dcedf..0000000
--- a/comphelper/source/misc/ihwrapnofilter.cxx
+++ /dev/null
@@ -1,112 +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 "comphelper/ihwrapnofilter.hxx"
-#include <cppuhelper/supportsservice.hxx>
-#include <com/sun/star/document/NoSuchFilterRequest.hpp>
-
-
-namespace comphelper
-{
-
-
- using namespace ::com::sun::star;
-
-
- OIHWrapNoFilterDialog::OIHWrapNoFilterDialog( uno::Reference< task::XInteractionHandler > xInteraction )
- :m_xInter( xInteraction )
- {
- }
-
- OIHWrapNoFilterDialog::~OIHWrapNoFilterDialog()
- {
- }
-
-
- uno::Sequence< OUString > SAL_CALL OIHWrapNoFilterDialog::impl_staticGetSupportedServiceNames()
- {
- uno::Sequence< OUString > aRet(1);
- aRet[0] = "com.sun.star.task.InteractionHandlerWrapper";
- return aRet;
- }
-
- OUString SAL_CALL OIHWrapNoFilterDialog::impl_staticGetImplementationName()
- {
- return OUString("com.sun.star.comp.task.InteractionHandlerWrapper");
- }
-
-
- // XInteractionHandler
-
- void SAL_CALL OIHWrapNoFilterDialog::handle( const uno::Reference< task::XInteractionRequest >& xRequest)
- throw( com::sun::star::uno::RuntimeException, std::exception )
- {
- if( !m_xInter.is() )
- return;
-
- uno::Any aRequest = xRequest->getRequest();
- document::NoSuchFilterRequest aNoSuchFilterRequest;
- if ( aRequest >>= aNoSuchFilterRequest )
- return;
- else
- m_xInter->handle( xRequest );
- }
-
-
- // XInteractionHandler2
-
- sal_Bool SAL_CALL OIHWrapNoFilterDialog::handleInteractionRequest( const uno::Reference< task::XInteractionRequest >& xRequest)
- throw( com::sun::star::uno::RuntimeException, std::exception )
- {
- if( !m_xInter.is() )
- return sal_False;
-
- uno::Any aRequest = xRequest->getRequest();
- document::NoSuchFilterRequest aNoSuchFilterRequest;
- if ( aRequest >>= aNoSuchFilterRequest )
- return sal_False;
- else
- {
- m_xInter->handle( xRequest );
- return sal_True;
- }
- }
-
- // XServiceInfo
- OUString SAL_CALL OIHWrapNoFilterDialog::getImplementationName()
- throw ( uno::RuntimeException, std::exception )
- {
- return impl_staticGetImplementationName();
- }
-
- sal_Bool SAL_CALL OIHWrapNoFilterDialog::supportsService( const OUString& ServiceName )
- throw ( uno::RuntimeException, std::exception )
- {
- return cppu::supportsService(this, ServiceName);
- }
-
- uno::Sequence< OUString > SAL_CALL OIHWrapNoFilterDialog::getSupportedServiceNames()
- throw ( uno::RuntimeException, std::exception )
- {
- return impl_staticGetSupportedServiceNames();
- }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/ihwrapnofilter.hxx b/include/comphelper/ihwrapnofilter.hxx
deleted file mode 100644
index 768d7eb..0000000
--- a/include/comphelper/ihwrapnofilter.hxx
+++ /dev/null
@@ -1,78 +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_COMPHELPER_IHWRAPNOFILTER_HXX
-#define INCLUDED_COMPHELPER_IHWRAPNOFILTER_HXX
-
-#include <com/sun/star/task/XInteractionHandler2.hpp>
-#include <com/sun/star/task/XInteractionHandler.hpp>
-#include <com/sun/star/task/XInteractionRequest.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-
-#include <cppuhelper/implbase2.hxx>
-#include <comphelper/comphelperdllapi.h>
-
-namespace comphelper {
-
- class COMPHELPER_DLLPUBLIC OIHWrapNoFilterDialog : public ::cppu::WeakImplHelper2
- < ::com::sun::star::task::XInteractionHandler2
- , ::com::sun::star::lang::XServiceInfo >
- {
- com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > m_xInter;
-
- public:
- OIHWrapNoFilterDialog( com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > xInteraction );
- virtual ~OIHWrapNoFilterDialog();
-
- static OUString SAL_CALL impl_staticGetImplementationName();
- static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames();
-
-
-
- // XInteractionHandler
-
-
- virtual void SAL_CALL handle( const com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest >& xRequest)
- throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-
-
- // XInteractionHandler2
-
-
- virtual sal_Bool SAL_CALL handleInteractionRequest( const com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest >& xRequest)
- throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-
-
- // XServiceInfo
-
-
- virtual OUString SAL_CALL getImplementationName()
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-
- };
-}
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index e8ab3b4..ef09280 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -441,7 +441,6 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
sc/source/ui/drawfunc/fudraw \
sc/source/ui/drawfunc/fuins1 \
sc/source/ui/drawfunc/fuins2 \
- sc/source/ui/drawfunc/fumark \
sc/source/ui/drawfunc/fupoor \
sc/source/ui/drawfunc/fusel \
sc/source/ui/drawfunc/fusel2 \
diff --git a/sc/source/ui/drawfunc/fumark.cxx b/sc/source/ui/drawfunc/fumark.cxx
deleted file mode 100644
index 19313d8..0000000
--- a/sc/source/ui/drawfunc/fumark.cxx
+++ /dev/null
@@ -1,258 +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 <sfx2/dispatch.hxx>
-#include <sfx2/viewfrm.hxx>
-
-#include "fumark.hxx"
-#include "sc.hrc"
-#include "tabvwsh.hxx"
-#include "scmod.hxx"
-#include "reffact.hxx"
-#include "document.hxx"
-#include "scresid.hxx"
-#include "drawview.hxx"
-#include "markdata.hxx"
-
-/*************************************************************************
-|*
-|* Funktion zum Aufziehen eines Rechtecks
-|*
-\************************************************************************/
-
-FuMarkRect::FuMarkRect(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewP,
- SdrModel* pDoc, SfxRequest& rReq) :
- FuPoor(pViewSh, pWin, pViewP, pDoc, rReq),
- bVisible(false),
- bStartDrag(false)
-{
-}
-
-/*************************************************************************
-|*
-|* Destruktor
-|*
-\************************************************************************/
-
-FuMarkRect::~FuMarkRect()
-{
-}
-
-/*************************************************************************
-|*
-|* MouseButtonDown-event
-|*
-\************************************************************************/
-
-bool FuMarkRect::MouseButtonDown(const MouseEvent& rMEvt)
-{
- // remember button state for creation of own MouseEvents
- SetMouseButtonCode(rMEvt.GetButtons());
-
- pWindow->CaptureMouse();
- pView->UnmarkAll(); // der Einheitlichkeit halber und wegen #50558#
- bStartDrag = true;
-
- aBeginPos = pWindow->PixelToLogic( rMEvt.GetPosPixel() );
- aZoomRect = Rectangle( aBeginPos, Size() );
- return true;
-}
-
-/*************************************************************************
-|*
-|* MouseMove-event
-|*
-\************************************************************************/
-
-bool FuMarkRect::MouseMove(const MouseEvent& rMEvt)
-{
- if ( bStartDrag )
- {
- if ( bVisible )
- pViewShell->DrawMarkRect(aZoomRect);
- Point aPixPos= rMEvt.GetPosPixel();
- ForceScroll(aPixPos);
-
- Point aEndPos = pWindow->PixelToLogic(aPixPos);
- Rectangle aRect(aBeginPos, aEndPos);
- aZoomRect = aRect;
- aZoomRect.Justify();
- pViewShell->DrawMarkRect(aZoomRect);
- bVisible = true;
- }
-
- ForcePointer(&rMEvt);
-
- return bStartDrag;
-}
-
-/*************************************************************************
-|*
-|* MouseButtonUp-event
-|*
-\************************************************************************/
-
-bool FuMarkRect::MouseButtonUp(const MouseEvent& rMEvt)
-{
- // remember button state for creation of own MouseEvents
- SetMouseButtonCode(rMEvt.GetButtons());
-
- if ( bVisible )
- {
- // Hide ZoomRect
- pViewShell->DrawMarkRect(aZoomRect);
- bVisible = false;
- }
-
- Size aZoomSizePixel = pWindow->LogicToPixel(aZoomRect).GetSize();
-
- sal_uInt16 nMinMove = pView->GetMinMoveDistancePixel();
- if ( aZoomSizePixel.Width() < nMinMove || aZoomSizePixel.Height() < nMinMove )
- {
- // Klick auf der Stelle
-
- aZoomRect.SetSize(Size()); // dann ganz leer
- }
-
- bStartDrag = false;
- pWindow->ReleaseMouse();
-
- pViewShell->GetViewData()->GetDispatcher().
- Execute(aSfxRequest.GetSlot(), SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD);
-
- // Daten an der View merken
-
- pViewShell->SetChartArea( aSourceRange, aZoomRect );
-
- // Chart-Dialog starten:
-
-// sal_uInt16 nId = ScChartDlgWrapper::GetChildWindowId();
-// SfxChildWindow* pWnd = pViewShell->GetViewFrame()->GetChildWindow( nId );
-// SC_MOD()->SetRefDialog( nId, pWnd ? sal_False : sal_True );
-
- return true;
-}
-
-/*************************************************************************
-|*
-|* Command-event
-|*
-\************************************************************************/
-
-sal_uInt8 FuMarkRect::Command(const CommandEvent& rCEvt)
-{
- if ( COMMAND_STARTDRAG == rCEvt.GetCommand() )
- {
- // nicht anfangen, auf der Tabelle rumzudraggen,
- // aber Maus-Status nicht zuruecksetzen
- return SC_CMD_IGNORE;
- }
- else
- return FuPoor::Command(rCEvt);
-}
-
-/*************************************************************************
-|*
-|* Tastaturereignisse bearbeiten
-|*
-|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls
-|* FALSE.
-|*
-\************************************************************************/
-
-bool FuMarkRect::KeyInput(const KeyEvent& rKEvt)
-{
- bool bReturn = false;
-
- switch ( rKEvt.GetKeyCode().GetCode() )
- {
- case KEY_ESCAPE:
- // beenden
- pViewShell->GetViewData()->GetDispatcher().
- Execute(aSfxRequest.GetSlot(), SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
- bReturn = true;
- break;
- }
-
- if (!bReturn)
- {
- bReturn = FuPoor::KeyInput(rKEvt);
- }
-
- return bReturn;
-}
-
-/*************************************************************************
-|*
-|* Function aktivieren
-|*
-\************************************************************************/
-
-void FuMarkRect::Activate()
-{
- FuPoor::Activate();
-
- // Markierung merken, bevor evtl. Tabelle umgeschaltet wird
-
- ScViewData* pViewData = pViewShell->GetViewData();
- ScMarkData& rMark = pViewData->GetMarkData();
-
- if ( !rMark.IsMultiMarked() && !rMark.IsMarked() )
- pViewShell->MarkDataArea( true );
-
- pViewData->GetMultiArea( aSourceRange ); // Mehrfachselektion erlaubt
-
-// pViewShell->Unmark();
-
- ForcePointer(NULL);
-}
-
-/*************************************************************************
-|*
-|* Function deaktivieren
-|*
-\************************************************************************/
-
-void FuMarkRect::Deactivate()
-{
- FuPoor::Deactivate();
-
- if (bVisible)
- {
- // Hide ZoomRect
- pViewShell->DrawMarkRect(aZoomRect);
- bVisible = false;
- bStartDrag = false;
- }
-}
-
-/*************************************************************************
-|*
-|* Maus-Pointer umschalten
-|*
-\************************************************************************/
-
-void FuMarkRect::ForcePointer(const MouseEvent* /* pMEvt */)
-{
- pViewShell->SetActivePointer( Pointer( POINTER_CHART ) );
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/fumark.hxx b/sc/source/ui/inc/fumark.hxx
deleted file mode 100644
index 93bd82f..0000000
--- a/sc/source/ui/inc/fumark.hxx
+++ /dev/null
@@ -1,57 +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_SC_SOURCE_UI_INC_FUMARK_HXX
-#define INCLUDED_SC_SOURCE_UI_INC_FUMARK_HXX
-
-#include "fupoor.hxx"
-#include "rangelst.hxx"
-
-
-/** Function for drawing a rectangle */
-class FuMarkRect : public FuPoor
-{
- protected:
- Point aBeginPos;
- Rectangle aZoomRect;
- bool bVisible;
- bool bStartDrag;
- ScRangeListRef aSourceRange;
-
- public:
- FuMarkRect(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView,
- SdrModel* pDoc, SfxRequest& rReq);
- virtual ~FuMarkRect();
-
- virtual bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE;
-
- virtual void Activate() SAL_OVERRIDE;
- virtual void Deactivate() SAL_OVERRIDE;
-
- virtual void ForcePointer(const MouseEvent* pMEvt);
-
- virtual bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE;
- virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE;
- virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE;
- virtual sal_uInt8 Command(const CommandEvent& rCEvt) SAL_OVERRIDE;
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx
index e24091c..1542a00 100644
--- a/sc/source/ui/view/tabvwsh2.cxx
+++ b/sc/source/ui/view/tabvwsh2.cxx
@@ -36,7 +36,6 @@
#include "fuconuno.hxx"
#include "fusel.hxx"
#include "futext.hxx"
-#include "fumark.hxx"
#include "fuinsert.hxx"
#include "global.hxx"
#include "sc.hrc"
diff --git a/unusedcode.easy b/unusedcode.easy
index b19d035..028b69d 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -9,6 +9,13 @@ DocxSdrExport::setFlyFrameGraphic(bool)
DocxSdrExport::setFrameBtLr(bool)
EditEngine::IsIdleFormatterActive() const
FPSCounter::getGPUTime()
+FPSCounter::gpuAccumulationTimeclear()
+FPSCounter::gpuTimeAccumulation()
+FPSCounter::gpuTimeStampEnd()
+FPSCounter::gpuTimeStampStart()
+FPSCounter::loadFPSShader(ShaderProgram*)
+FPSCounter::printFPS(glTF::glTFViewport*)
+FPSCounter::timeStamp()
FillAttributes::FillAttributes()
FillAttributes::getFillGradientAttribute() const
Font::LoadSystemFont(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, int)
@@ -26,7 +33,8 @@ MenuBar::GetMenuBarButtonRectPixel(unsigned short)
MenuBar::RemoveMenuBarButton(unsigned short)
MenuBar::SetMenuBarButtonHighlightHdl(unsigned short, Link const&)
OpenGLContext::getOpenGLWindow()
-OpenGLRender::CreateTextTexture(rtl::OUString&, Font, long, com::sun::star::awt::Point, com::sun::star::awt::Size, long)
+OpenGLContext::renderToFile()
+OpenGLRender::CreateTextTexture(rtl::OUString const&, Font, long, com::sun::star::awt::Point, com::sun::star::awt::Size, long)
OutputDevice::GetCanvas() const
OutputDevice::HasAlpha()
OutputDevice::LogicToLogic(basegfx::B2DPolyPolygon const&, MapMode const&, MapMode const&)
@@ -207,32 +215,19 @@ basegfx::tools::containsOnlyHorizontalAndVerticalEdges(basegfx::B2DPolyPolygon c
canvas::createSurfaceProxyManager(boost::shared_ptr<canvas::IRenderModule> const&)
chart::ChartTypeUnoDlg::Create(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&)
chart::ShapeToolbarController::create(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&)
-chart::opengl3D::Line::Line(unsigned int)
-chart::opengl3D::OpenGL3DRenderer::AddExtrude3DObjectPoint(float, float, float)
-chart::opengl3D::OpenGL3DRenderer::AddPolygon3DObjectNormalPoint(float, float, float)
-chart::opengl3D::OpenGL3DRenderer::AddPolygon3DObjectPoint(float, float, float)
-chart::opengl3D::OpenGL3DRenderer::AddShape3DExtrudeObject(int, int, float, float, float)
-chart::opengl3D::OpenGL3DRenderer::AddShapePolygon3DObject(int, bool, int, long, int)
-chart::opengl3D::OpenGL3DRenderer::CreateActualRoundedCube(float, int, int, float, float, float)
-chart::opengl3D::OpenGL3DRenderer::EndAddExtrude3DObjectPoint()
-chart::opengl3D::OpenGL3DRenderer::EndAddPolygon3DObjectNormalPoint()
-chart::opengl3D::OpenGL3DRenderer::EndAddPolygon3DObjectPoint()
-chart::opengl3D::OpenGL3DRenderer::EndAddShape3DExtrudeObject()
-chart::opengl3D::OpenGL3DRenderer::EndAddShapePolygon3DObject()
+chart::opengl3D::Camera::zoom(unsigned int)
+chart::opengl3D::Line::Line(chart::opengl3D::OpenGL3DRenderer*, unsigned int)
+chart::opengl3D::OpenGL3DRenderer::CreateBMPHeader(unsigned char*, int, int)
chart::opengl3D::OpenGL3DRenderer::GetTime()
-chart::opengl3D::OpenGL3DRenderer::LoadShaders()
-chart::opengl3D::OpenGL3DRenderer::OpenGL3DRenderer()
chart::opengl3D::OpenGL3DRenderer::ProcessPickingBox()
chart::opengl3D::OpenGL3DRenderer::ProcessUnrenderedShape()
chart::opengl3D::OpenGL3DRenderer::RenderClickPos(Point)
chart::opengl3D::OpenGL3DRenderer::RenderFPS(float)
-chart::opengl3D::OpenGL3DRenderer::Set3DSenceInfo(glm::detail::tvec3<float>, glm::detail::tmat4x4<float>, bool, int)
chart::opengl3D::OpenGL3DRenderer::SetClickPos(Point)
chart::opengl3D::OpenGL3DRenderer::SetFPS(float)
-chart::opengl3D::OpenGL3DRenderer::SetLightInfo(bool, int, glm::detail::tvec4<float>)
chart::opengl3D::OpenGL3DRenderer::init()
-chart::opengl3D::Rectangle::Rectangle(unsigned int)
-chart::opengl3D::Text::Text(unsigned int)
+chart::opengl3D::Rectangle::Rectangle(chart::opengl3D::OpenGL3DRenderer*, unsigned int)
+chart::opengl3D::Text::Text(chart::opengl3D::OpenGL3DRenderer*, unsigned int)
comphelper::detail::ConfigurationWrapper::getGroupReadWrite(boost::shared_ptr<comphelper::ConfigurationChanges> const&, rtl::OUString const&) const
comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue(rtl::OUString const&) const
comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue(boost::shared_ptr<comphelper::ConfigurationChanges> const&, rtl::OUString const&, com::sun::star::uno::Any const&) const
More information about the Libreoffice-commits
mailing list