Le 23/08/2011 22:22, Andras Timar a écrit :
Hi,
2011/8/23 julien2412<[email protected]>:
Hello again,
First, thank you Jan for your help.
Now i'm almost at the end, the symbol "There does not exist" appears in
dialog window. The pb is when I select it, it appears correctly very quickly
(0,5s) the first time then I've got a rectangle. Then if i test again, it
doesn't appear anymore correctly. I must restart LO to have it correctly
0,5s. I don't know why.
Please send your patch as it is now. It is easier to help, when we see
the modified code.
Thanks,
Andras
I put the patch as it is now. (i haven't git updated my libo repository
since 2 days).
In addition of this patch, there are the 2 png files.
Julien.
diff --git a/hwpfilter/source/hwpeq.cxx b/hwpfilter/source/hwpeq.cxx
index 0808d51..16b8c27 100644
--- a/hwpfilter/source/hwpeq.cxx
+++ b/hwpfilter/source/hwpeq.cxx
@@ -184,6 +184,7 @@ static hwpeq eq_tbl[] = {
{ "exarrow", NULL, 0, 0 },
{ "exist", "\\exists", 0, 0 },
{ "exists", NULL, 0, 0 },
+ { "notexists", NULL, 0, 0 },
{ "exp", NULL, 0, EQ_CASE },
{ "for", NULL, 0, 0 },
{ "forall", NULL, 0, 0 },
diff --git a/hwpfilter/source/mapping.h b/hwpfilter/source/mapping.h
index 89e29c9..2c238cd 100644
--- a/hwpfilter/source/mapping.h
+++ b/hwpfilter/source/mapping.h
@@ -181,6 +181,7 @@ const struct FormulaEntry FormulaMapTab[] = {
{"because", 0x2235},
{"identical", 0x2237},
{"exists", 0x2203},
+{"notexists", 0x2204},
{"noteq", 0x2260}, // !=
{"neq", 0x2260},
{"doteq", 0x2250},
diff --git a/ooo_custom_images/classic/classic_images.tar.gz
b/ooo_custom_images/classic/classic_images.tar.gz
index e9578d9..0a10102 100644
Binary files a/ooo_custom_images/classic/classic_images.tar.gz and
b/ooo_custom_images/classic/classic_images.tar.gz differ
diff --git a/starmath/inc/helpids.h b/starmath/inc/helpids.h
index f27b47e..1da4029 100644
--- a/starmath/inc/helpids.h
+++ b/starmath/inc/helpids.h
@@ -160,6 +160,7 @@
#define HID_SMA_LIMINFX
"STARMATH_HID_SMA_LIMINFX"
#define HID_SMA_LIMSUPX
"STARMATH_HID_SMA_LIMSUPX"
#define HID_SMA_EXISTS
"STARMATH_HID_SMA_EXISTS"
+#define HID_SMA_NOTEXISTS
"STARMATH_HID_SMA_NOTEXISTS"
#define HID_SMA_FORALL
"STARMATH_HID_SMA_FORALL"
#define HID_SMA_NABLA
"STARMATH_HID_SMA_NABLA"
#define HID_SMA_INTX
"STARMATH_HID_SMA_INTX"
diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx
index 43c0992..43283d8 100644
--- a/starmath/inc/parse.hxx
+++ b/starmath/inc/parse.hxx
@@ -97,7 +97,7 @@ enum SmTokenType
TMINUSPLUS, TOPLUS, TOMINUS, TDIV, TOTIMES,
TODIVIDE, TTRANSL, TTRANSR, TIINT, TIIINT,
TLINT, TLLINT, TLLLINT, TPROD, TCOPROD,
- TFORALL, TEXISTS, TLIM, TNABLA, TTOWARD,
+ TFORALL, TEXISTS, TNOTEXISTS, TLIM, TNABLA,
TTOWARD,
TSINH, TCOSH, TTANH, TCOTH, TASIN,
TACOS, TATAN, TLN, TLOG, TUOPER,
TBOPER, TBLACK, TWHITE, TRED, TGREEN,
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index f7aa0f2..4d7509b 100755
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -390,6 +390,7 @@
#define RID_UPARROW (RID_APP_START + 2018)
#define RID_DOWNARROW (RID_APP_START + 2019)
#define RID_EXISTS (RID_APP_START + 1608)
+#define RID_NOTEXISTS (RID_APP_START + 1618)
#define RID_FORALL (RID_APP_START + 1612)
// new menue resource ID's
diff --git a/starmath/inc/types.hxx b/starmath/inc/types.hxx
index 8353f6e..d3f30d5 100644
--- a/starmath/inc/types.hxx
+++ b/starmath/inc/types.hxx
@@ -120,6 +120,7 @@ enum MathSymbol
MS_IN = (sal_Unicode) 0x2208,
MS_NOTIN = (sal_Unicode) 0x2209,
MS_EXISTS = (sal_Unicode) 0x2203,
+ MS_NOTEXISTS = (sal_Unicode) 0x2204,
MS_BACKEPSILON = (sal_Unicode) 0x220D,
MS_ALEPH = (sal_Unicode) 0x2135,
MS_IM = (sal_Unicode) 0x2111,
diff --git a/starmath/qa/cppunit/test_nodetotextvisitors.cxx
b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
index f7b282c..234e87d 100644
--- a/starmath/qa/cppunit/test_nodetotextvisitors.cxx
+++ b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
@@ -353,6 +353,7 @@ void Test::SimpleMisc()
parseandparseagain("partial", "Partial");
parseandparseagain("nabla", "Nabla");
parseandparseagain("exists", "There exists");
+ parseandparseagain("notexists", "There not exists");
parseandparseagain("forall", "For all");
parseandparseagain("hbar", "H bar");
parseandparseagain("lambdabar", "Lambda bar");
diff --git a/starmath/source/commands.src b/starmath/source/commands.src
index 9d618bb..150f0df 100644
--- a/starmath/source/commands.src
+++ b/starmath/source/commands.src
@@ -119,6 +119,7 @@ String RID_LIMX { Text = "lim <?> " ; };
String RID_LIMINFX { Text = "liminf <?> " ; };
String RID_LIMSUPX { Text = "limsup <?> " ; };
String RID_EXISTS { Text = "exists " ; };
+String RID_NOTEXISTS { Text = "notexists " ; };
String RID_FORALL { Text = "forall " ; };
String RID_INTX { Text = "int <?> " ; };
String RID_IINTX { Text = "iint <?> " ; };
@@ -1410,6 +1411,12 @@ Menu RID_COMMANDMENU
};
MenuItem
{
+ Identifier = RID_NOTEXISTS;
+ HelpId = HID_SMA_NOTEXISTS;
+ Text = "not exists";
+ };
+ MenuItem
+ {
Identifier = RID_FORALL;
HelpId = HID_SMA_FORALL;
Text = "forall";
@@ -1513,49 +1520,3 @@ Menu RID_COMMANDMENU
};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index c332bbe..69d1b06 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -342,6 +342,9 @@ sal_Bool MathType::LookupChar(sal_Unicode nChar,String
&rRet,sal_uInt8 nVersion,
case 0x2203:
pC = " exists ";
break;
+ case 0x2204:
+ pC = " notexists ";
+ break;
case 0x2205:
pC = " emptyset ";
break;
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 06859ce..a2f36bf 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -163,6 +163,7 @@ static const SmTokenTableEntry aTokenTable[] =
{ "emptyset" , TEMPTYSET, MS_EMPTYSET, TGSTANDALONE, 5},
{ "equiv", TEQUIV, MS_EQUIV, TGRELATION, 0},
{ "exists", TEXISTS, MS_EXISTS, TGSTANDALONE, 5},
+ { "notexists", TNOTEXISTS, MS_NOTEXISTS, TGSTANDALONE, 5},
{ "exp", TEXP, '\0', TGFUNCTION, 5},
{ "fact", TFACT, MS_FACT, TGUNOPER, 5},
{ "fixed", TFIXED, '\0', TGFONT, 0},
@@ -1449,6 +1450,7 @@ void SmParser::Term()
case TEMPTYSET :
case TINFINITY :
case TEXISTS :
+ case TNOTEXISTS :
case TFORALL :
case TPARTIAL :
case TNABLA :
diff --git a/starmath/source/toolbox.src b/starmath/source/toolbox.src
index 07e728f..e0576dc 100644
--- a/starmath/source/toolbox.src
+++ b/starmath/source/toolbox.src
@@ -1322,7 +1322,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Size = MAP_APPFONT ( 65 , 95 ) ;
SVLook = TRUE ;
Hide = TRUE ;
- LineCount = 4 ;
+ LineCount = 5 ;
ItemList =
{
ToolBoxItem
@@ -1351,12 +1351,38 @@ FloatingWindow RID_TOOLBOXWINDOW
};
ToolBoxItem
{
+ Identifier = RID_NOTEXISTS ;
+ HelpId = HID_SMA_NOTEXISTS ;
+ Text [ en-US ] = "There Not Exists";
+ };
+ ToolBoxItem
+ {
+ Type = TOOLBOXITEM_BREAK ;
+ };
+ ToolBoxItem
+ {
Identifier = RID_FORALL ;
HelpId = HID_SMA_FORALL ;
Text [ en-US ] = "For All";
};
ToolBoxItem
{
+ Type = TOOLBOXITEM_SPACE ;
+ };
+ ToolBoxItem
+ {
+ Type = TOOLBOXITEM_SPACE ;
+ };
+ ToolBoxItem
+ {
+ Type = TOOLBOXITEM_SPACE ;
+ };
+ ToolBoxItem
+ {
+ Type = TOOLBOXITEM_SPACE ;
+ };
+ ToolBoxItem
+ {
Type = TOOLBOXITEM_BREAK ;
};
ToolBoxItem
@@ -1726,6 +1752,7 @@ FloatingWindow RID_TOOLBOXWINDOW
RID_PARTIAL ; \
RID_NABLA ; \
RID_EXISTS ; \
+ RID_NOTEXISTS ; \
RID_FORALL ; \
RID_HBAR; \
RID_LAMBDABAR ; \
@@ -1742,7 +1769,7 @@ FloatingWindow RID_TOOLBOXWINDOW
RID_DOTSUP ; \
RID_DOTSDOWN ; \
}; \
- IdCount = { 19 ; };
+ IdCount = { 20 ; };
ImageList RID_IL_MISC
{
diff --git a/svtools/inc/svtools/htmlkywd.hxx b/svtools/inc/svtools/htmlkywd.hxx
index 999ee21..37de7da 100644
--- a/svtools/inc/svtools/htmlkywd.hxx
+++ b/svtools/inc/svtools/htmlkywd.hxx
@@ -329,6 +329,7 @@
#define OOO_STRING_SVTOOLS_HTML_S_eta "eta"
#define OOO_STRING_SVTOOLS_HTML_S_euro "euro"
#define OOO_STRING_SVTOOLS_HTML_S_exist "exist"
+#define OOO_STRING_SVTOOLS_HTML_S_notexist "not exist"
#define OOO_STRING_SVTOOLS_HTML_S_fnof "fnof"
#define OOO_STRING_SVTOOLS_HTML_S_forall "forall"
#define OOO_STRING_SVTOOLS_HTML_S_frasl "frasl"
diff --git
a/testautomation/framework/optional/input/help_browser/OpenOffice.org_help_topics_en-US.txt
b/testautomation/framework/optional/input/help_browser/OpenOffice.org_help_topics_en-US.txt
index d523c5e..e3d842d 100755
---
a/testautomation/framework/optional/input/help_browser/OpenOffice.org_help_topics_en-US.txt
+++
b/testautomation/framework/optional/input/help_browser/OpenOffice.org_help_topics_en-US.txt
@@ -18987,6 +18987,7 @@ OpenOffice.org Math : Thai
OpenOffice.org Math : Thai;entering text
OpenOffice.org Math : Thai;language settings
OpenOffice.org Math : there exists symbol
+OpenOffice.org Math : there not exists symbol
OpenOffice.org Math : thesaurus
OpenOffice.org Math : thesaurus;activating for a language
OpenOffice.org Math : ticker text
diff --git
a/testautomation/framework/optional/input/help_browser/Oracle_Open_Office_help_topics_en-US.txt
b/testautomation/framework/optional/input/help_browser/Oracle_Open_Office_help_topics_en-US.txt
index 0db04d4..30276ce 100644
---
a/testautomation/framework/optional/input/help_browser/Oracle_Open_Office_help_topics_en-US.txt
+++
b/testautomation/framework/optional/input/help_browser/Oracle_Open_Office_help_topics_en-US.txt
@@ -15964,6 +15964,7 @@ Oracle Open Office Math : Thai
Oracle Open Office Math : Thai;entering text
Oracle Open Office Math : Thai;language settings
Oracle Open Office Math : there exists symbol
+Oracle Open Office Math : there not exists symbol
Oracle Open Office Math : thesaurus
Oracle Open Office Math : thesaurus;activating for a language
Oracle Open Office Math : ticker text
diff --git a/testautomation/global/win/e_mathop.win
b/testautomation/global/win/e_mathop.win
index 9beb74b..4fb1ed4 100644
--- a/testautomation/global/win/e_mathop.win
+++ b/testautomation/global/win/e_mathop.win
@@ -147,6 +147,7 @@ Infinity sym:STARMATH_HID_SMA_INFINITY
Partial sym:STARMATH_HID_SMA_PARTIAL
Nabla sym:STARMATH_HID_SMA_NABLA
ThereExists sym:STARMATH_HID_SMA_EXISTS
+ThereNotExists sym:STARMATH_HID_SMA_NOTEXISTS
ForAll sym:STARMATH_HID_SMA_FORALL
HBar sym:STARMATH_HID_SMA_HBAR
LambdaBar sym:STARMATH_HID_SMA_LAMBDABAR
diff --git a/testautomation/global/win/mathop.win
b/testautomation/global/win/mathop.win
index e4f7d3c..e1bdac3 100644
--- a/testautomation/global/win/mathop.win
+++ b/testautomation/global/win/mathop.win
@@ -147,6 +147,7 @@ Unendlich sym:STARMATH_HID_SMA_INFINITY
Partial sym:STARMATH_HID_SMA_PARTIAL
Nabla sym:STARMATH_HID_SMA_NABLA
EsExistiert sym:STARMATH_HID_SMA_EXISTS
+EsNichtExistiert sym:STARMATH_HID_SMA_NOTEXISTS
FuerAlle sym:STARMATH_HID_SMA_FORALL
HQuer sym:STARMATH_HID_SMA_HBAR
LambdaQuer sym:STARMATH_HID_SMA_LAMBDABAR
diff --git a/testautomation/math/required/includes/m_010_.inc
b/testautomation/math/required/includes/m_010_.inc
index 7f3cd894..71e6501 100644
--- a/testautomation/math/required/includes/m_010_.inc
+++ b/testautomation/math/required/includes/m_010_.inc
@@ -579,6 +579,10 @@ try
inc i
Printlog " i: "+i
Call Bereinigen
+ ThereNotExists.Click
+ inc i
+ Printlog " i: "+i
+ Call Bereinigen
ForAll.Click
inc i
Printlog " i: "+i
_______________________________________________
LibreOffice mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
