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 d338abb875 Cursor should not need a tooltip.
d338abb875 is described below
commit d338abb87533e6de2c74c9e9bc7de5af7f587fd5
Author: mseidel <[email protected]>
AuthorDate: Thu Dec 11 19:58:28 2025 +0100
Cursor should not need a tooltip.
Apart from that, the tooltips are annoying and produce re-draw errors
(cherry picked from commit f50fa3f6d451a0cd0ce1d5f0603f40174ba4936e)
---
main/sw/source/ui/docvw/docvw.hrc | 11 +++++-----
main/sw/source/ui/docvw/docvw.src | 41 +++++++++++++++++++------------------
main/sw/source/ui/docvw/edtwin2.cxx | 23 +++++++++++----------
3 files changed, 39 insertions(+), 36 deletions(-)
diff --git a/main/sw/source/ui/docvw/docvw.hrc
b/main/sw/source/ui/docvw/docvw.hrc
index 4a9d261436..87f83d6d0d 100644
--- a/main/sw/source/ui/docvw/docvw.hrc
+++ b/main/sw/source/ui/docvw/docvw.hrc
@@ -66,11 +66,12 @@
#define STR_ENDNOTE (RC_DOCVW_BEGIN
+ 14)
#define STR_FOOTNOTE (RC_DOCVW_BEGIN + 15)
-#define STR_TABLE_COL_ADJUST (RC_DOCVW_BEGIN + 16)
-#define STR_TABLE_ROW_ADJUST (RC_DOCVW_BEGIN + 17)
-#define STR_TABLE_SELECT_ALL (RC_DOCVW_BEGIN + 18)
-#define STR_TABLE_SELECT_ROW (RC_DOCVW_BEGIN + 19)
-#define STR_TABLE_SELECT_COL (RC_DOCVW_BEGIN + 20)
+// Removed tooltips for table selection in December 2025
+//#define STR_TABLE_COL_ADJUST (RC_DOCVW_BEGIN + 16)
+//#define STR_TABLE_ROW_ADJUST (RC_DOCVW_BEGIN + 17)
+//#define STR_TABLE_SELECT_ALL (RC_DOCVW_BEGIN + 18)
+//#define STR_TABLE_SELECT_ROW (RC_DOCVW_BEGIN + 19)
+//#define STR_TABLE_SELECT_COL (RC_DOCVW_BEGIN + 20)
#define STR_SMARTTAG_CLICK (RC_DOCVW_BEGIN + 21)
diff --git a/main/sw/source/ui/docvw/docvw.src
b/main/sw/source/ui/docvw/docvw.src
index 6e27fb11e3..89f941da4f 100644
--- a/main/sw/source/ui/docvw/docvw.src
+++ b/main/sw/source/ui/docvw/docvw.src
@@ -259,26 +259,27 @@ InfoBox MSG_READONLY_CONTENT
Message [ en-US ] = "Readonly content cannot be changed.\nNo
modifications will be accepted." ;
};
-String STR_TABLE_COL_ADJUST
-{
- Text [ en-US ] = "Adjust table column" ;
-};
-String STR_TABLE_ROW_ADJUST
-{
- Text [ en-US ] = "Adjust table row" ;
-};
-String STR_TABLE_SELECT_ALL
-{
- Text [ en-US ] = "Select whole table" ;
-};
-String STR_TABLE_SELECT_ROW
-{
- Text [ en-US ] = "Select table row" ;
-};
-String STR_TABLE_SELECT_COL
-{
- Text [ en-US ] = "Select table column" ;
-};
+// Removed tooltips for table selection
+//String STR_TABLE_COL_ADJUST
+//{
+// Text [ en-US ] = "Adjust table column" ;
+//};
+//String STR_TABLE_ROW_ADJUST
+//{
+// Text [ en-US ] = "Adjust table row" ;
+//};
+//String STR_TABLE_SELECT_ALL
+//{
+// Text [ en-US ] = "Select whole table" ;
+//};
+//String STR_TABLE_SELECT_ROW
+//{
+// Text [ en-US ] = "Select table row" ;
+//};
+//String STR_TABLE_SELECT_COL
+//{
+// Text [ en-US ] = "Select table column" ;
+//};
String STR_SMARTTAG_CLICK
{
diff --git a/main/sw/source/ui/docvw/edtwin2.cxx
b/main/sw/source/ui/docvw/edtwin2.cxx
index 2b616531b9..81264aa38e 100644
--- a/main/sw/source/ui/docvw/edtwin2.cxx
+++ b/main/sw/source/ui/docvw/edtwin2.cxx
@@ -101,7 +101,6 @@ static void lcl_GetRedlineHelp( const SwRedline& rRedl,
String& rTxt, sal_Bool b
}
}
-
void SwEditWin::RequestHelp(const HelpEvent &rEvt)
{
SwWrtShell &rSh = rView.GetWrtShell();
@@ -156,7 +155,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
{
sTxt = UniString(
ByteString::CreateFromDouble(
-
((SwTblBoxValue*)aCntntAtPos.aFnd.pAttr)->GetValue() )
+
((SwTblBoxValue*)aCntntAtPos.aFnd.pAttr)->GetValue() )
, gsl_getSystemTextEncoding());
}
break;
@@ -336,7 +335,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
pRefFld->IsRefToNumItemCrossRefBookmark() )
{
sTxt = pRefFld->GetExpandedTxtOfReferencedTxtNode();
-
if ( sTxt.Len() > 80 )
+
if ( sTxt.Len() > 80 )
{
sTxt.Erase( 80 );
sTxt += '.';
@@ -382,6 +381,8 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
bWeiter = sal_False;
}
+// Removed tooltips for table selection
+/*
if( bWeiter )
{
sal_uInt8 nTabCols = rSh.WhichMouseTabCol(aPos);
@@ -420,6 +421,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
}
bWeiter = sal_False;
}
+*/
}
/*
@@ -427,7 +429,6 @@ aktuelle Zeichenvorlage anzeigen?
if( bWeiter && rEvt.GetMode() & ( HELPMODE_QUICK | HELPMODE_BALLOON ))
{
SwCharFmt* pChrFmt = rSh.GetCurCharFmt();
-
}
*/
if( bWeiter && pSdrView && bQuickBalloon)
@@ -477,7 +478,7 @@ aktuelle Zeichenvorlage anzeigen?
if (sTxt.Len() && pObj)
{
sTxt = URIHelper::removePassword( sTxt,
INetURLObject::WAS_ENCODED,
-
INetURLObject::DECODE_UNAMBIGUOUS);
+
INetURLObject::DECODE_UNAMBIGUOUS);
Rectangle aLogicPix =
LogicToPixel(pObj->GetLogicRect());
Rectangle
aScreenRect(OutputToScreenPixel(aLogicPix.TopLeft()),
@@ -504,7 +505,7 @@ void SwEditWin::PrePaint()
}
}
-void SwEditWin::Paint(const Rectangle& rRect)
+void SwEditWin::Paint(const Rectangle& rRect)
{
#if defined(MYDEBUG)
// StartUp-Statistik
@@ -539,14 +540,14 @@ void SwEditWin::Paint(const Rectangle& rRect)
// TODO/LATER: What's the replacement for this? Do we need it?
SwDocShell* pDocShell = GetView().GetDocShell();
- SvInPlaceEnvironment *pIpEnv = pDocShell ?
-
pDocShell->GetIPEnv() : 0;
+ SvInPlaceEnvironment *pIpEnv = pDocShell ?
+
pDocShell->GetIPEnv() : 0;
if ( pIpEnv && pIpEnv->GetRectsChangedLockCount() )
- //Wir stehen in Groessenverhandlungen (MM), Paint verzögern
+ // Wir stehen in Größenverhandlungen (MM), Paint verzögern
Invalidate( rRect );
else */
- if ( GetView().GetVisArea().GetWidth() <= 0 ||
- GetView().GetVisArea().GetHeight() <= 0 )
+ if ( GetView().GetVisArea().GetWidth() <= 0 ||
+ GetView().GetVisArea().GetHeight() <= 0 )
Invalidate( rRect );
else
pWrtShell->Paint( rRect );
