diff options
| -rw-r--r-- | include/vcl/cmdevt.hxx | 6 | ||||
| -rw-r--r-- | sw/source/ui/docvw/edtwin.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/cmdevt.cxx | 6 | ||||
| -rw-r--r-- | vcl/source/window/winproc.cxx | 1 |
4 files changed, 1 insertions, 14 deletions
diff --git a/include/vcl/cmdevt.hxx b/include/vcl/cmdevt.hxx index 58b8b088afb7..e67a2a99e611 100644 --- a/include/vcl/cmdevt.hxx +++ b/include/vcl/cmdevt.hxx @@ -48,8 +48,6 @@ private: OUString maText; sal_uInt16* mpTextAttr; xub_StrLen mnCursorPos; - xub_StrLen mnDeltaStart; - xub_StrLen mnOldTextLen; sal_uInt16 mnCursorFlags; sal_Bool mbOnlyCursor; @@ -58,8 +56,6 @@ public: const sal_uInt16* pTextAttr, sal_Int32 nCursorPos, sal_uInt16 nCursorFlags, - sal_Int32 nDeltaStart, - sal_Int32 nOldTextLen, sal_Bool bOnlyCursor ); CommandExtTextInputData( const CommandExtTextInputData& rData ); ~CommandExtTextInputData(); @@ -71,8 +67,6 @@ public: sal_Bool IsCursorVisible() const { return (mnCursorFlags & EXTTEXTINPUT_CURSOR_INVISIBLE) == 0; } sal_Bool IsCursorOverwrite() const { return (mnCursorFlags & EXTTEXTINPUT_CURSOR_OVERWRITE) != 0; } sal_uInt16 GetCursorFlags() const { return mnCursorFlags; } - xub_StrLen GetDeltaStart() const { return mnDeltaStart; } - xub_StrLen GetOldTextLen() const { return mnOldTextLen; } sal_Bool IsOnlyCursorChanged() const { return mbOnlyCursor; } }; diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index 93607fb044d6..0cf02b65f1d2 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -5778,7 +5778,7 @@ void QuickHelpData::Start( SwWrtShell& rSh, sal_uInt16 nWrdLen ) EXTTEXTINPUT_ATTR_HIGHLIGHT; const std::vector<sal_uInt16> aAttrs( nL, nVal ); CommandExtTextInputData aCETID( sStr, &aAttrs[0], nL, - 0, 0, 0, sal_False ); + 0, false ); //fdo#33092. If the current input language is the default //language that text would appear in if typed, then don't diff --git a/vcl/source/window/cmdevt.cxx b/vcl/source/window/cmdevt.cxx index 15f6d06ffcb0..6326defdc137 100644 --- a/vcl/source/window/cmdevt.cxx +++ b/vcl/source/window/cmdevt.cxx @@ -26,8 +26,6 @@ CommandExtTextInputData::CommandExtTextInputData( const OUString& rText, const sal_uInt16* pTextAttr, sal_Int32 nCursorPos, sal_uInt16 nCursorFlags, - sal_Int32 nDeltaStart, - sal_Int32 nOldTextLen, sal_Bool bOnlyCursor ) : maText( rText ) { @@ -39,8 +37,6 @@ CommandExtTextInputData::CommandExtTextInputData( const OUString& rText, else mpTextAttr = NULL; mnCursorPos = nCursorPos; - mnDeltaStart = nDeltaStart; - mnOldTextLen = nOldTextLen; mnCursorFlags = nCursorFlags; mbOnlyCursor = bOnlyCursor; } @@ -58,8 +54,6 @@ CommandExtTextInputData::CommandExtTextInputData( const CommandExtTextInputData& else mpTextAttr = NULL; mnCursorPos = rData.mnCursorPos; - mnDeltaStart = rData.mnDeltaStart; - mnOldTextLen = rData.mnOldTextLen; mnCursorFlags = rData.mnCursorFlags; mbOnlyCursor = rData.mbOnlyCursor; } diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 83cd4d2a8d1f..d42cb95654eb 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -1301,7 +1301,6 @@ static long ImplHandleExtTextInput( Window* pWindow, // Call Event and store the information CommandExtTextInputData aData( rText, pTextAttr, nCursorPos, nCursorFlags, - nDeltaStart, pWinData->mpExtOldText->getLength(), bOnlyCursor ); *pWinData->mpExtOldText = rText; if ( pWinData->mpExtOldAttrAry ) |