Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
4c8d9dbc
Kaydet (Commit)
4c8d9dbc
authored
Tem 23, 2010
tarafından
Thomas Lange [tl]
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
cws tl83: #i113276# changes to Greek symbol set because of new OpenSymbol font
üst
1acb3fa5
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
60 additions
and
11 deletions
+60
-11
symbol.hxx
starmath/inc/symbol.hxx
+12
-0
dialog.cxx
starmath/source/dialog.cxx
+3
-0
document.cxx
starmath/source/document.cxx
+1
-5
edit.cxx
starmath/source/edit.cxx
+8
-0
mathmlexport.cxx
starmath/source/mathmlexport.cxx
+0
-1
mathmlimport.cxx
starmath/source/mathmlimport.cxx
+0
-1
symbol.cxx
starmath/source/symbol.cxx
+34
-1
types.cxx
starmath/source/types.cxx
+1
-1
view.cxx
starmath/source/view.cxx
+1
-2
No files found.
starmath/inc/symbol.hxx
Dosyayı görüntüle @
4c8d9dbc
...
...
@@ -38,7 +38,10 @@
#include <map>
#include <vector>
#include <set>
#include <functional>
#include <algorithm>
#include "unomodel.hxx"
#include "utility.hxx"
#include "smmod.hxx"
...
...
@@ -133,6 +136,15 @@ typedef std::map< String, SmSym, lt_String > SymbolMap_t;
// vector of pointers to the actual symbols in the above container
typedef
std
::
vector
<
const
SmSym
*
>
SymbolPtrVec_t
;
struct
lt_SmSymPtr
:
public
std
::
binary_function
<
const
SmSym
*
,
const
SmSym
*
,
bool
>
{
bool
operator
()
(
const
SmSym
*
pSym1
,
const
SmSym
*
pSym2
)
{
return
pSym1
->
GetCharacter
()
<
pSym2
->
GetCharacter
();
}
};
class
SmSymbolManager
:
public
SfxListener
{
SymbolMap_t
m_aSymbols
;
...
...
starmath/source/dialog.cxx
Dosyayı görüntüle @
4c8d9dbc
...
...
@@ -1600,6 +1600,9 @@ BOOL SmSymbolDialog::SelectSymbolSet(const XubString &rSymbolSetName)
aSymbolSetName
=
rSymbolSetName
;
aSymbolSet
=
rSymbolMgr
.
GetSymbolSet
(
aSymbolSetName
);
// sort symbols by Unicode position (useful for displaying Greek characters alphabetically)
std
::
sort
(
aSymbolSet
.
begin
(),
aSymbolSet
.
end
(),
lt_SmSymPtr
()
);
aSymbolSetDisplay
.
SetSymbolSet
(
aSymbolSet
);
if
(
aSymbolSet
.
size
()
>
0
)
SelectSymbol
(
0
);
...
...
starmath/source/document.cxx
Dosyayı görüntüle @
4c8d9dbc
...
...
@@ -1123,13 +1123,9 @@ void SmDocShell::Execute(SfxRequest& rReq)
case
SID_TEXT
:
{
const
SfxStringItem
&
rItem
=
(
const
SfxStringItem
&
)
rReq
.
GetArgs
()
->
Get
(
SID_TEXT
);
const
SfxStringItem
&
rItem
=
(
const
SfxStringItem
&
)
rReq
.
GetArgs
()
->
Get
(
SID_TEXT
);
if
(
GetText
()
!=
rItem
.
GetValue
())
{
SetText
(
rItem
.
GetValue
());
}
}
break
;
...
...
starmath/source/edit.cxx
Dosyayı görüntüle @
4c8d9dbc
...
...
@@ -251,7 +251,10 @@ IMPL_LINK( SmEditWindow, ModifyTimerHdl, Timer *, EMPTYARG /*pTimer*/ )
{
SmModule
*
pp
=
SM_MOD
();
if
(
pp
->
GetConfig
()
->
IsAutoRedraw
())
{
Flush
();
aModifyTimer
.
Stop
();
}
return
0
;
}
...
...
@@ -917,7 +920,10 @@ void SmEditWindow::InsertText(const String& Text)
{
DBG_ASSERT
(
pEditView
,
"EditView missing"
);
if
(
pEditView
)
{
pEditView
->
InsertText
(
Text
);
aModifyTimer
.
Start
();
}
}
void
SmEditWindow
::
Flush
()
...
...
@@ -928,9 +934,11 @@ void SmEditWindow::Flush()
pEditEngine
->
ClearModifyFlag
();
SmViewShell
*
pViewSh
=
rCmdBox
.
GetView
();
if
(
pViewSh
)
{
pViewSh
->
GetViewFrame
()
->
GetDispatcher
()
->
Execute
(
SID_TEXT
,
SFX_CALLMODE_STANDARD
,
new
SfxStringItem
(
SID_TEXT
,
GetText
()),
0L
);
}
}
if
(
aCursorMoveTimer
.
IsActive
())
...
...
starmath/source/mathmlexport.cxx
Dosyayı görüntüle @
4c8d9dbc
...
...
@@ -75,7 +75,6 @@
#include <memory>
#include "mathmlexport.hxx"
#include "mathtype.hxx"
#include <starmath.hrc>
#include <unomodel.hxx>
#include <document.hxx>
...
...
starmath/source/mathmlimport.cxx
Dosyayı görüntüle @
4c8d9dbc
...
...
@@ -71,7 +71,6 @@ one go*/
#include <memory>
#include "mathmlimport.hxx"
#include "mathtype.hxx"
#include <starmath.hrc>
#include <unomodel.hxx>
#include <document.hxx>
...
...
starmath/source/symbol.cxx
Dosyayı görüntüle @
4c8d9dbc
...
...
@@ -290,6 +290,28 @@ void SmSymbolManager::Load()
DBG_ERROR
(
"no symbol set found"
);
m_bModified
=
false
;
}
// now add a %i... symbol to the 'iGreek' set for every symbol found in the 'Greek' set.
SmLocalizedSymbolData
aLocalizedData
;
const
String
aGreekSymbolSetName
(
aLocalizedData
.
GetUiSymbolSetName
(
A2OU
(
"Greek"
)
)
);
const
SymbolPtrVec_t
aGreekSymbols
(
GetSymbolSet
(
aGreekSymbolSetName
)
);
String
aSymbolSetName
(
(
sal_Unicode
)
'i'
);
aSymbolSetName
+=
aGreekSymbolSetName
;
size_t
nSymbols
=
aGreekSymbols
.
size
();
for
(
size_t
i
=
0
;
i
<
nSymbols
;
++
i
)
{
// make the new symbol a copy but with ITALIC_NORMAL, and add it to iGreek
const
SmSym
&
rSym
=
*
aGreekSymbols
[
i
];
Font
aFont
(
rSym
.
GetFace
()
);
DBG_ASSERT
(
aFont
.
GetItalic
()
==
ITALIC_NONE
,
"expected Font with ITALIC_NONE, failed."
);
aFont
.
SetItalic
(
ITALIC_NORMAL
);
String
aSymbolName
(
(
sal_Unicode
)
'i'
);
aSymbolName
+=
rSym
.
GetName
();
SmSym
aSymbol
(
aSymbolName
,
aFont
,
rSym
.
GetCharacter
(),
aSymbolSetName
,
TRUE
/*bIsPredefined*/
);
AddOrReplaceSymbol
(
aSymbol
);
}
}
void
SmSymbolManager
::
Save
()
...
...
@@ -314,10 +336,21 @@ void SmSymbolManager::Save()
}
DBG_ASSERT(pSym - pSymbols == nSaveSymbolCnt, "wrong number of symbols" );
#endif
// prepare to skip symbols from iGreek on saving
SmLocalizedSymbolData
aLocalizedData
;
String
aSymbolSetName
(
(
sal_Unicode
)
'i'
);
aSymbolSetName
+=
aLocalizedData
.
GetUiSymbolSetName
(
A2OU
(
"Greek"
)
);
SymbolPtrVec_t
aTmp
(
GetSymbols
()
);
std
::
vector
<
SmSym
>
aSymbols
;
for
(
size_t
i
=
0
;
i
<
aTmp
.
size
();
++
i
)
aSymbols
.
push_back
(
*
aTmp
[
i
]
);
{
// skip symbols from iGreek set since those symbols always get added
// by computational means in SmSymbolManager::Load
if
(
aTmp
[
i
]
->
GetSymbolSetName
()
!=
aSymbolSetName
)
aSymbols
.
push_back
(
*
aTmp
[
i
]
);
}
rCfg
.
SetSymbols
(
aSymbols
);
#if 0
delete [] pSymbols;
...
...
starmath/source/types.cxx
Dosyayı görüntüle @
4c8d9dbc
...
...
@@ -38,7 +38,7 @@ sal_Unicode ConvertMathPrivateUseAreaToUnicode( sal_Unicode cChar )
if
(
IsInPrivateUseArea
(
cChar
))
{
DBG_ASSERT
(
0
,
"Error: private use area characters should no longer be in use!"
);
cRes
=
(
sal_Unicode
)
'
&
'
;
// just some character that should easily be notice as odd in the context
cRes
=
(
sal_Unicode
)
'
@
'
;
// just some character that should easily be notice as odd in the context
}
return
cRes
;
}
...
...
starmath/source/view.cxx
100755 → 100644
Dosyayı görüntüle @
4c8d9dbc
...
...
@@ -1545,8 +1545,7 @@ void SmViewShell::Execute(SfxRequest& rReq)
case
SID_INSERTTEXT
:
{
const
SfxStringItem
&
rItem
=
(
const
SfxStringItem
&
)
rReq
.
GetArgs
()
->
Get
(
SID_INSERTTEXT
);
(
const
SfxStringItem
&
)
rReq
.
GetArgs
()
->
Get
(
SID_INSERTTEXT
);
if
(
pWin
)
pWin
->
InsertText
(
rItem
.
GetValue
());
break
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment