This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 40b2257ab3 Taskpane is long gone...
40b2257ab3 is described below
commit 40b2257ab361b7fb3ecb42a7ddb2cda05afca6f6
Author: mseidel <[email protected]>
AuthorDate: Tue Apr 22 10:23:56 2025 +0200
Taskpane is long gone...
(cherry picked from commit a7c72a4218c29b48bc41900f5a6be5a0925a4d3e)
---
main/starmath/source/smdll.cxx | 16 ++++++----------
main/starmath/source/view.cxx | 9 +++------
2 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/main/starmath/source/smdll.cxx b/main/starmath/source/smdll.cxx
index bcbcf2044d..fcc756e3f8 100644
--- a/main/starmath/source/smdll.cxx
+++ b/main/starmath/source/smdll.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,24 +7,21 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_starmath.hxx"
-
#include <sot/factory.hxx>
#ifndef _SVX_SVXIDS_HRC //autogen
#include <svx/svxids.hrc>
@@ -36,7 +33,6 @@
#include <sfx2/docfile.hxx>
#include <sfx2/docfilt.hxx>
#include <sfx2/app.hxx>
-#include <sfx2/taskpane.hxx>
#ifndef _SMDLL_HXX
#include <smdll.hxx>
@@ -91,8 +87,6 @@ void SmDLL::Init()
SmToolBoxWrapper::RegisterChildWindow(sal_True);
SmCmdBoxWrapper::RegisterChildWindow(sal_True);
-
- ::sfx2::TaskPaneWrapper::RegisterChildWindow( sal_False, pp );
}
/*************************************************************************
@@ -109,3 +103,5 @@ void SmDLL::Exit()
*GetAppData(SHL_SM) = 0;
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/starmath/source/view.cxx b/main/starmath/source/view.cxx
index 9c3379d359..ba3e011121 100644
--- a/main/starmath/source/view.cxx
+++ b/main/starmath/source/view.cxx
@@ -19,12 +19,9 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_starmath.hxx"
-
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleEventObject.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
@@ -75,7 +72,6 @@
#include "toolbox.hxx"
#include "mathmlimport.hxx"
-
#define MINWIDTH 200
#define MINHEIGHT 200
#define MINSPLIT 40
@@ -193,7 +189,7 @@ void SmGraphicWindow::MouseButtonDown(const MouseEvent&
rMEvt)
if (rMEvt.GetClicks() != 1)
{ // select whole token
- // for text include terminating symbol (ie '"')
+ // for text include terminating symbol (i.e.
'"')
aSel.nEndPos += aToken.aText.Len() + nExtra
+ (aToken.eType
== TTEXT ? 1 : 0);
}
@@ -785,7 +781,6 @@ SFX_IMPL_INTERFACE(SmViewShell, SfxViewShell, SmResId(0))
SFX_VISIBILITY_FULLSCREEN | SFX_VISIBILITY_SERVER,
SmResId(RID_MATH_TOOLBOX ));
- SFX_CHILDWINDOW_REGISTRATION(SID_TASKPANE);
SFX_CHILDWINDOW_REGISTRATION(SmToolBoxWrapper::GetChildWindowId());
SFX_CHILDWINDOW_REGISTRATION(SmCmdBoxWrapper::GetChildWindowId());
}
@@ -2006,3 +2001,5 @@ void SmViewShell::Notify( SfxBroadcaster& , const
SfxHint& rHint )
}
}
}
+
+/* vim: set noet sw=4 ts=4: */
