summaryrefslogtreecommitdiff
path: root/compilerplugins
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2015-12-11 10:24:28 +0100
committerJan Holesovsky <kendy@collabora.com>2015-12-11 10:43:00 +0100
commit007543f9672b69de4dcf1dba1ccca0fc9d165897 (patch)
tree02f1e20742e201debc5cb0b1a581a337336d7389 /compilerplugins
parent5639a769fbcf672b1f32638764b4492674b894e6 (diff)
sc: Merge ScMultiTextWnd into ScTextWnd.
Change-Id: I21ed0e37feec0e7c078c2e284b7f4169f0cff432
Diffstat (limited to 'compilerplugins')
-rw-r--r--compilerplugins/clang/mergeclasses.results1
1 files changed, 0 insertions, 1 deletions
diff --git a/compilerplugins/clang/mergeclasses.results b/compilerplugins/clang/mergeclasses.results
index c07eb0d08157..b5752a411ead 100644
--- a/compilerplugins/clang/mergeclasses.results
+++ b/compilerplugins/clang/mergeclasses.results
@@ -104,7 +104,6 @@ merge ScRefHandlerCaller with ScTPValidationValue
merge ScRefHandlerHelper with ScValidationDlg
merge ScSimpleEditSourceHelper with ScEditEngineTextObj
merge ScTabView with ScViewFunc
-merge ScTextWnd with ScMultiTextWnd
merge ScVbaControlContainer with ScVbaButtonContainer
merge ScVbaObjectContainer with ScVbaControlContainer
merge ScViewFunc with ScDBFunc